| commit | fb6068711e9082e8c3732bafbba78c750536283d | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Oct 23 17:25:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 17:25:27 2014 +0000 |
| tree | cba62d0d64153aa2169651696bc238591341d679 | |
| parent | a9253994510f27ba861a0b51bab59a3ad69a31a4 [diff] | |
| parent | a9a32b1400c72210fd6e3a9b2b3aa7961fa9d7b9 [diff] |
am a9a32b14: (-s ours) am daa9dfcb: Merge "Fix build" * commit 'a9a32b1400c72210fd6e3a9b2b3aa7961fa9d7b9': Fix build