tree 2bbdfd16add142a246f03da5710fe83d577cbe73
parent c7cb88f1677fcee87ebe09054cb7f217de33626e
parent 61e92a026472786ce81f4738e7d77bcad69697b8
author Elliott Hughes <enh@google.com> 1391655832 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391655832 +0000

am 61e92a02: am 68835ee8: Merge "system/core LP64 cleanup."

* commit '61e92a026472786ce81f4738e7d77bcad69697b8':
  system/core LP64 cleanup.