| commit | 0f32cf0ca14907d1fb853e27e8ab86fc4251b869 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Thu Mar 26 23:37:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 23:37:35 2015 +0000 |
| tree | 1065b724850de0d7efe8dad58416b7a115d2ca5d | |
| parent | bba88ce1a6cd85d6fb904813d22f48be4fe44a3e [diff] | |
| parent | 2e7401dff617a1047dcc661c14ae03be004d32bf [diff] |
am 2e7401df: (-s ours) DO NOT MERGE ANYWHERE. reset to 50457b9 * commit '2e7401dff617a1047dcc661c14ae03be004d32bf':