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