| commit | 9601ba633230dccefe4a40fb738eddb808702417 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Jul 15 01:28:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 01:28:31 2015 +0000 |
| tree | 4de62f0e65cc872ed4beb81e34969203e5b65af1 | |
| parent | a836fc5583efcdf4da8163bc9e268e3e6fc16d20 [diff] | |
| parent | 7cdd1514d4366f218bb5d4d92ce159912fcce8e0 [diff] |
am 7cdd1514: am 231657df: (-s ours) am 495adcaa: 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 '7cdd1514d4366f218bb5d4d92ce159912fcce8e0': DO NOT MERGE: Mimmum application memory should be 96MB