| commit | e1dc54300c71e8c2884e08044a64078134aae4d2 | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Thu Oct 23 17:29:37 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 17:29:37 2014 +0000 |
| tree | cba62d0d64153aa2169651696bc238591341d679 | |
| parent | ba7d25082a0284a6a00a499604cc4ae673b3a733 [diff] | |
| parent | 84286d8bf6b985e708a6ca296dcc64f13a82d944 [diff] |
am 84286d8b: (-s ours) am 5dabb58d: am 1a3708ec: am 9ba343d7: (-s ours) am a78b25f8: (-s ours) DO NOT MERGE * commit '84286d8bf6b985e708a6ca296dcc64f13a82d944':