tree d1d9a9f0af5f525796dc1111e30766ab1ddad02a
parent 73cb02262b956368078fafa453a0be77de3b3080
parent 22dd0fee8fac517021e9f7d970da70a7b9803385
author Yifan Hong <elsk@google.com> 1497045982 +0000
committer android-build-merger <android-build-merger@google.com> 1497045982 +0000

Fix aosp_arm build for ODR
am: 22dd0fee8f

Change-Id: I104b3b5f712e373491c8b871096dfb613d88989b