| commit | d4ecf5cadb2ef887e55198a47f7ef41427fd682f | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Wed Oct 29 07:01:14 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:01:14 2014 +0000 |
| tree | 10da860fcff71886af91d082e31f0e1917926848 | |
| parent | 967af0bff6e160c18aa3ec2ca0a20ebdc0796ef6 [diff] | |
| parent | fb6068711e9082e8c3732bafbba78c750536283d [diff] |
am fb606871: am a9a32b14: (-s ours) am daa9dfcb: Merge "Fix build" * commit 'fb6068711e9082e8c3732bafbba78c750536283d': Fix build