tree 5d2a5419dec9153140a5d9e8225ef24e4bd30630
parent 85da4d35664a98913226cdaf599833a6092d470e
parent 55d4a46f6da08b248a467097d56a2762d47d7043
author Dan Willemsen <dwillemsen@google.com> 1467232782 +0000
committer android-build-merger <android-build-merger@google.com> 1467232782 +0000

Merge \"Detect \`uname -m\` == i686 as a 32-bit host\"
am: 55d4a46f6d

Change-Id: Ia66952b98541755c55df1eb98775d749d2155dc1