tree ce4e8c230cd873131ab5f9ea81c0d55a722e240c
parent 554f0a899015a9aa5ae2a60e465a10bb2b3704f0
parent a144ab1ba53050cbd4cda24ffa6eab23e9282aa3
author Ying Wang <wangying@android.com> 1452294014 +0000
committer android-build-merger <android-build-merger@google.com> 1452294014 +0000

Merge "Android.mk: make 32bit binary use arm assembly code on 64bit platform"
am: a144ab1ba5

* commit 'a144ab1ba53050cbd4cda24ffa6eab23e9282aa3':