tree 3fae7e490de0cbd1f08d34ab96b64be57e611cb3
parent 0e3b22b3e1edb3784af3f5d3e968af9d0f9f424e
parent b47156990a061b30ad1e3ff9b1dbf6b6a951f845
author Daniel Xie <dxie@google.com> 1441404126 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441404126 +0000

am b4715699: am 09c6bcfb: (-s ours) Merge "DO NOT MERGE: Mimmum application memory should be 96MB" into kitkat-cts-dev

* commit 'b47156990a061b30ad1e3ff9b1dbf6b6a951f845':
  DO NOT MERGE: Mimmum application memory should be 96MB