am 2f594332: am 2e321bcc: (-s ours) Merge "DO NOT MERGE: Mimmum application memory should be 96MB" into kitkat-cts-dev automerge: 09c6bcf  -s ours automerge: 906578c

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