| commit | e57a647c686ec044ed3677b40df441eac17beac3 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Thu Aug 27 20:37:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 20:37:13 2015 +0000 |
| tree | 640eae42d9e4191b425679a0147c304724bc148f | |
| parent | cb3b2aaf0236b680ef8565d1d1ae5a28641b0184 [diff] | |
| parent | a111f5e435896be18784c3ea133f901167ee68d1 [diff] |
am a111f5e4: am b7ac716b: (-s ours) am 4efc67aa: am 74d08b26: (-s ours) am fb385ac6: am 571d9731: Merge commit \'c642d411\' into HEAD * commit 'a111f5e435896be18784c3ea133f901167ee68d1':