| commit | 1c241ddf9be4a39268cd6ae37a24c72895e9d456 | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Wed Apr 29 00:22:03 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 29 00:22:03 2015 +0000 |
| tree | 1f93dc6955fee0d1865de3d610abdced8db86350 | |
| parent | 2ff0250624fcc28a5e1e0c63f44da9b6227ca3a2 [diff] | |
| parent | 9e0f321ae816cde2372b1a5fa8c7b909e799aa2d [diff] |
am 9e0f321a: am 91132c4e: Merge "Fix build" * commit '9e0f321ae816cde2372b1a5fa8c7b909e799aa2d': Fix build