| commit | 51f8fbcc955c4342b88cc852e987a5911f24a606 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Thu Sep 18 06:10:39 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 18 06:10:39 2014 +0000 |
| tree | 2870123b58a0875ce2fd8bf6cd2f77cd9f2df123 | |
| parent | a1ed35becf008aa8f55b8f5f2e9004be27440f3d [diff] | |
| parent | 6d24d4ff06a042ca1c716bea5acbca9733b3a96f [diff] |
am 6d24d4ff: Merge "Restore some aosp/master changes lost in cherry-pick 7c438b19b71932ac8a44eff44f20744a01559c8d" * commit '6d24d4ff06a042ca1c716bea5acbca9733b3a96f': Restore some aosp/master changes lost in cherry-pick 7c438b19b71932ac8a44eff44f20744a01559c8d