| commit | 2e389193b01adb2d8f75e6c4038caaab4334b3ab | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Wed Jun 04 00:33:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 04 00:33:18 2014 +0000 |
| tree | 2538a9f04233cb2b34c6d2233c571ba0ef6f6cbb | |
| parent | a005445a7a0901675bbd04395a9eb699639aea9e [diff] | |
| parent | a8a7f001f142a77a2c406455ace4a8c00e692111 [diff] |
am a8a7f001: Merge "Fix x86 and x86_64 builds." * commit 'a8a7f001f142a77a2c406455ace4a8c00e692111': Fix x86 and x86_64 builds.