| commit | fd6d0c6cc15d8d46abcbb87f33a214e9fadea693 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Thu Mar 26 23:29:01 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 23:29:01 2015 +0000 |
| tree | 461c827954978e9533b8c0c5fbdea31e1399e565 | |
| parent | 7639ed163f4ad5634051d2e12d4be5bc4030a9a8 [diff] | |
| parent | 9ab89cb0991688b95130a30210acccd26211a1ae [diff] |
am 9ab89cb0: (-s ours) DO NOT MERGE ANYWHERE. reset to 50457b9 * commit '9ab89cb0991688b95130a30210acccd26211a1ae':