| commit | a42b3718f5d17634c5a4852b8fd8d399f65c7c38 | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Wed Oct 29 07:01:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:01:07 2014 +0000 |
| tree | 10da860fcff71886af91d082e31f0e1917926848 | |
| parent | b718fd06b6fe81db9fc39b08ef875aca623b62b2 [diff] | |
| parent | a3dd7f1fcc086146643b6edc5aa37dbf5343d2ff [diff] |
am a3dd7f1f: (-s ours) am 440e66e8: (-s ours) am e1a015da: am a78b25f8: DO NOT MERGE * commit 'a3dd7f1fcc086146643b6edc5aa37dbf5343d2ff':