tree e589d1a73db2368671ea0e2aa5d73ebd826a824e
parent 0dc3583043bb578b149e50a9928894eff2819508
parent 0e7e5db7a0e70fd90fc61133b6a109c85eab29bf
author Glenn Kasten <gkasten@android.com> 1395081761 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395081761 +0000

am 0e7e5db7: Merge "More 32-bit only"

* commit '0e7e5db7a0e70fd90fc61133b6a109c85eab29bf':
  More 32-bit only