commit | 8721776286a63b7167a85dc8733ff00c814f04b4 | [log] [tgz] |
---|---|---|
author | Sudhir Sharma <sudhshar@codeaurora.org> | Mon Mar 09 23:25:30 2015 -0700 |
committer | Sudhir Sharma <sudhshar@codeaurora.org> | Mon Mar 09 23:25:30 2015 -0700 |
tree | 8f86bc6cbe46899eec672e572e7e3bb3af457dbb | |
parent | 16f7eda7c4283fa890342282c19340ebfc0146cb [diff] | |
parent | 9ef2e964cab7bbdb3582ad58653148669a485dc7 [diff] |
Merge tag 'android-5.1.0_r1' into HEAD Android 5.1.0 release 1 Conflicts: CleanSpec.mk core/Makefile core/build_id.mk core/version_defaults.mk Change-Id: Iac8a943c8115fdc13613aa796c239a7bccd2f7b6