tree 5ab6b99eb13340d9d8e98c6e9b5ce1636a32a94c
parent 21e0d8d8070d330d706b7fefc180686cdd6d134e
parent 3279a68c2735ac1e1265ab2ecf5ee9c9afa076b3
author Narayan Kamath <narayan@google.com> 1479894076 +0000
committer android-build-merger <android-build-merger@google.com> 1479894076 +0000

Merge "force 32-bit build to fix garbled output" am: b2d04a95a8 am: bf6d92d8d8 am: 1623a6176e
am: 3279a68c27

Change-Id: Id127fac592cfa2cb4fde330cdacd49b85cd43420