commit | 04190bcba76b67b49a72e7075dc307bc2dc55a10 | [log] [tgz] |
---|---|---|
author | Daniel Xie <dxie@google.com> | Thu Sep 10 20:54:44 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 10 20:54:44 2015 +0000 |
tree | 6af0fef97dc3ff6fd88a07a4c5b56a9ffa5f4656 | |
parent | 79b8a7a5f60854c5185966002eb390cf773f1456 [diff] | |
parent | 42bcd44bd9b02a849d64e12eea580af0ce6ff40a [diff] |
am 42bcd44b: (-s ours) am d92207f5: am b4715699: am 09c6bcfb: (-s ours) Merge "DO NOT MERGE: Mimmum application memory should be 96MB" into kitkat-cts-dev * commit '42bcd44bd9b02a849d64e12eea580af0ce6ff40a': DO NOT MERGE: Mimmum application memory should be 96MB