| commit | a111f5e435896be18784c3ea133f901167ee68d1 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Thu Aug 27 05:24:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:24:38 2015 +0000 |
| tree | 0c95cfa6c7fd28b15ac08f4d70497562fc384835 | |
| parent | 3abb451f70438fc7d5ff75999fd922c243e408e9 [diff] | |
| parent | b7ac716b2b31a8536d0379c6dd85b8f7e74017f1 [diff] |
am b7ac716b: (-s ours) am 4efc67aa: am 74d08b26: (-s ours) am fb385ac6: am 571d9731: Merge commit \'c642d411\' into HEAD * commit 'b7ac716b2b31a8536d0379c6dd85b8f7e74017f1':