tree acdfacafcc4d3f37d8ec4f02f509d088d20f19d0
parent 803aa1791805ca1846407fc7c62f96bc711cf1a9
parent 3d44382aca0528a163be0bc7619208ce4b1e5798
author Dianne Hackborn <hackbod@google.com> 1420574976 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420574976 +0000

am 3d44382a: am 6f36bd3a: am 5fe8197f: Merge "Fix issue #18907544: Activity manager miscomputed high RAM for 64 bit" into lmp-mr1-dev

* commit '3d44382aca0528a163be0bc7619208ce4b1e5798':
  Fix issue #18907544: Activity manager miscomputed high RAM for 64 bit