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