| commit | 75df44031ff50ac984acbac56823fcb7d10ad66a | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Wed Oct 29 07:04:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:04:58 2014 +0000 |
| tree | 10da860fcff71886af91d082e31f0e1917926848 | |
| parent | 5c98f0cfbc038b051f521d3614d033d843d362f9 [diff] | |
| parent | e1dc54300c71e8c2884e08044a64078134aae4d2 [diff] |
am e1dc5430: (-s ours) am 84286d8b: (-s ours) am 5dabb58d: am 1a3708ec: am 9ba343d7: (-s ours) am a78b25f8: (-s ours) DO NOT MERGE * commit 'e1dc54300c71e8c2884e08044a64078134aae4d2':