| commit | f4e9f8c9eb9175523e097674ed3645ba6cbd428d | [log] [tgz] |
|---|---|---|
| author | Daniel Sandler <dsandler@google.com> | Tue Oct 07 18:33:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 07 18:33:18 2014 +0000 |
| tree | a71286416890b7bb9d974235a31dd2fef913fe40 | |
| parent | 825a3a0cc78f0e0331f5db63a18c703b4a235dfa [diff] | |
| parent | 51d0622fbad1fb4f2fdf1fb7e925bdcb32d6cad0 [diff] |
am 51d0622f: am 934cc7bd: am 8722a48c: am 6cfb3718: (-s ours) Merge "foo" * commit '51d0622fbad1fb4f2fdf1fb7e925bdcb32d6cad0':