| commit | 2746220935d118f881026b122441040389f8bf8f | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Mon Mar 23 22:55:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 23 22:55:21 2015 +0000 |
| tree | 41a8d15e914bc85e359a2f76ce699d9eb2c90643 | |
| parent | 987de844f9e325ec251885c107c74045e9a46e02 [diff] | |
| parent | 7ff3b8d526d6cc6d6a99f4287451fc53e83f4746 [diff] |
am 7ff3b8d5: (-s ours) reset back to 96d34bc * commit '7ff3b8d526d6cc6d6a99f4287451fc53e83f4746':