tree 87481d01e321452c89bdad48989ddfb41fcaa4be
parent 9c4920b3a665f1c1c7946bdab652cb2cbe880fe4
parent 4b9e4a3294cec41364d9b444066b812c82d20d35
author Andrew Hsieh <andrewhsieh@google.com> 1403347005 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403347005 +0000

am 4b9e4a32: am ea738930: am 1b587c94: Merge "64-bit in android-L"

* commit '4b9e4a3294cec41364d9b444066b812c82d20d35':
  64-bit in android-L