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

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

Change-Id: I7822e891bf2463b98101ecd55498da328ba89613