tree 8718714b4b52886109356dd39cdc7745c32116ce
parent 5d33de08196b5c77a58a3e3a045a1b3bf31e09a7
parent cf61a7a0db4361689f0ee583fbbe7b3a0519a538
author Narayan Kamath <narayan@google.com> 1397033428 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397033428 +0000

am cf61a7a0: Merge "Add 32 / 64 bit abi lists to system properties."

* commit 'cf61a7a0db4361689f0ee583fbbe7b3a0519a538':
  Add 32 / 64 bit abi lists to system properties.