commit | 5be57758c082cab48cfcf09c81c4b76ace4291e6 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 20 01:48:44 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Oct 20 01:48:44 2015 +0000 |
tree | b67dc7e0a454d3c36fde15deeb336b52e0bfd6e7 | |
parent | 5443a8f5b786bfc03633ea5821d95dffc856e3e8 [diff] | |
parent | 29c75386448128b0ba69f62eb01cc05bfe9d051d [diff] |
Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am: a7d4ead252 am: 38c77c1443 am: 80fa64f36f am: 27602cefb4 am: 921fe1ae4d am: 29c7538644 * commit '29c75386448128b0ba69f62eb01cc05bfe9d051d':