OSDN Git Service

Merge "Fix arm32 build" am: b26918002c am: 971e9f70bf
authorColin Cross <ccross@android.com>
Fri, 26 Aug 2016 01:20:39 +0000 (01:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Aug 2016 01:20:39 +0000 (01:20 +0000)
am: e51e96acf1

Change-Id: If4a8b2b2476d00b138fbb63b9a48a68e2c7bd35d


Trivial merge