| commit | 611dceecd57ab651514942823cd1eb4a10b8a9fb | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Sat Jul 12 19:36:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 12 19:36:58 2014 +0000 |
| tree | c7df8e6b174387d649c36e4e56c4bd06991fba18 | |
| parent | c785caa4b44a1a96e21904fac8cf857f2d9f5e96 [diff] | |
| parent | ce61f74f153c7d185d1a3d5e2d6dc02ccf768963 [diff] |
am ce61f74f: am 56cbd19b: Merge "Fix build." * commit 'ce61f74f153c7d185d1a3d5e2d6dc02ccf768963': Fix build.