| commit | f27a969dd7b395808c08dadf0c0e66419318b597 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Apr 28 22:02:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 28 22:02:37 2015 +0000 |
| tree | 7de0a2711e781637008cada6922e226a886e8e7c | |
| parent | 063f7eb5c7159eb36debe93b36560d30543b8d84 [diff] | |
| parent | d3f51b0ed62fceb463402273d6bdb2e07061c8b8 [diff] |
am d3f51b0e: Merge "resolved conflicts for merge of 44204f68 to lmp-mr1-dev" into lmp-mr1-dev * commit 'd3f51b0ed62fceb463402273d6bdb2e07061c8b8': Amending testcase to support updated memory requirement for L.