tree 5ab6b99eb13340d9d8e98c6e9b5ce1636a32a94c
parent 32015a3c4923dac0dc59c4ce17a1b0944809c128
parent 1623a6176e7d68762fe4b3312a4a1de8042292db
author Narayan Kamath <narayan@google.com> 1479893925 +0000
committer android-build-merger <android-build-merger@google.com> 1479893925 +0000

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

Change-Id: Iee460accb1f4d9a521bd56b0ab6462c37419c7ff