| commit | 087a79edf48466bd4f6991d17c226997e53892dd | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 20:51:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 20:51:51 2015 +0000 |
| tree | 0fe003ba0d24a69430cffa048f11766abc81bc61 | |
| parent | 1aae6c37a7cbf2c5c650724dbdcae0a7569de261 [diff] | |
| parent | 60299d9d56b28608a2299f1423b1e9f9d521ddce [diff] |
am 60299d9d: am 4fd0c805: am 2b019876: am 7c177381: (-s ours) am a76ed9b1: am 8d5253e6: am 2c0a5ca5: am cfca25f4: am 906578cc: (-s ours) Merge "DO NOT MERGE: Mimmum application memory should be 96MB" into kitkat-cts-dev automerge: 09c6bcf -s ours * commit '60299d9d56b28608a2299f1423b1e9f9d521ddce':