commit | 784ae49eb5df19ab5e76b87543ea9d5076e1e095 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 20 02:05:12 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Oct 20 02:05:12 2015 +0000 |
tree | 8d1486e4ee303112cd3cf2704f66f8dfcdf5f695 | |
parent | 6fda4eba9c23e47f9a4fe9ad43412eca02d9d8c5 [diff] | |
parent | 5be57758c082cab48cfcf09c81c4b76ace4291e6 [diff] |
Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am: a7d4ead252 am: 38c77c1443 am: 80fa64f36f am: 27602cefb4 am: 921fe1ae4d am: 29c7538644 am: 5be57758c0 * commit '5be57758c082cab48cfcf09c81c4b76ace4291e6':