commit | edb21bcd85d86435b58f8f679cb988182b6bbc29 | [log] [tgz] |
---|---|---|
author | Adnan Begovic <adnan@cyngn.com> | Thu Oct 15 11:06:53 2015 -0700 |
committer | Adnan Begovic <adnan@cyngn.com> | Thu Oct 15 11:06:53 2015 -0700 |
tree | 41f25669e58c34351a0ba05f23784aa0d71a3cc4 | |
parent | 126d57e0a86e568d0039c72f046ebf9eada3bb06 [diff] | |
parent | 86c188f70d5a1db93cfcef97bafe9a97cc4bc726 [diff] |
Merge remote-tracking branch 'upstream/marshmallow-release', tag 'android-6.0.0_r1' into HEAD Android 6.0.0 release 1 Change-Id: Iccee3137d91fb86555abe4596e356cc6c2a2ce47