tree 5d2a5419dec9153140a5d9e8225ef24e4bd30630
parent 317d1594e47157f9471064f9e5c2da35ed21ad23
parent db9f3489bcad4408b3521c9b1c242e41e4ccff99
author Dan Willemsen <dwillemsen@google.com> 1467233121 +0000
committer android-build-merger <android-build-merger@google.com> 1467233121 +0000

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

Change-Id: Ia6e75590c95a7e670f977a33b540b76f8b995af8