OSDN Git Service

am 110ea46e: resolved conflicts for merge of 8af7e8ed to master
authorNarayan Kamath <narayan@google.com>
Wed, 9 Apr 2014 12:14:49 +0000 (12:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 9 Apr 2014 12:14:49 +0000 (12:14 +0000)
commitb35b8bed841f234b6862bf445973fd1534892163
treea659b95c62e9e975db699a68a3d8d7b9779379c4
parentc619de3592c6c80422ce2c7b5338bff90b790161
parent110ea46e096b2aff0afb60224406fb76699308c7
am 110ea46e: resolved conflicts for merge of 8af7e8ed to master

* commit '110ea46e096b2aff0afb60224406fb76699308c7':
  Add 32 / 64 bit abi lists to system properties.
CleanSpec.mk