| commit | 766a518ae6de4b81c4fc139f90b51521a2f681b7 | [log] [tgz] |
|---|---|---|
| author | Ricardo Cerqueira <ricardo@cyngn.com> | Thu Nov 05 01:07:58 2015 +0000 |
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | Thu Nov 05 01:07:58 2015 +0000 |
| tree | e694616b3a0c42642ed38f396cba9ba5e5ff8671 | |
| parent | 5cd236c279a16120cabc9e334285277f9e79f213 [diff] | |
| parent | 358c8909f5dd043f9d8bfee61f567701946dc19a [diff] |
Merge tag 'android-6.0.0_r26' into HEAD Android 6.0.0 release 26 Conflicts: core/Makefile core/build_id.mk tools/releasetools/ota_from_target_files.py Change-Id: Ia1404ee9cd931a6540ea0dd3e2aa7b32d649e80c