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