| commit | 06ca5fadbdb2f2f97895a43cf4e866b9f25ea008 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Sat Jul 12 19:41:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 12 19:41:07 2014 +0000 |
| tree | 89042ce5f75987f59e54ab9d85cac5023ee0d640 | |
| parent | 9d6dfd63c919eaf9333d794524b33d8743452946 [diff] | |
| parent | 611dceecd57ab651514942823cd1eb4a10b8a9fb [diff] |
am 611dceec: am ce61f74f: am 56cbd19b: Merge "Fix build." * commit '611dceecd57ab651514942823cd1eb4a10b8a9fb': Fix build.