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)
* commit '110ea46e096b2aff0afb60224406fb76699308c7':
  Add 32 / 64 bit abi lists to system properties.

1  2 
CleanSpec.mk

diff --cc CleanSpec.mk
Simple merge