tree 6b6458804b11ab15a13c89626318b2d541114659
parent 3e24474006d0a06c41071b18dbed386f196c639f
parent b06addc8413286624d02e976b4ff6af5a41b9bee
author Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> 1476755765 +0000
committer android-build-merger <android-build-merger@google.com> 1476755765 +0000

Merge "Fix assembly code for clang's integrated as"
am: b06addc841

Change-Id: Ief412ee8fc6a2ef01d70b3bacf40fae401757c77