tree 6dd55d24155642b7f6b7eda9ca13d13b313449df
parent bedecf1ac01d8e3e2a1508dfba239e75728e4c43
parent 9c1c62aea21a91f7dbb6a9153d3402eb9ed90f32
author Daniel Xie <dxie@google.com> 1430242625 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430242625 +0000

am 9c1c62ae: am 1a58f7d6: am fd7879ec: Merge "Amending testcase to support updated memory requirement for L." into lmp-mr1-dev

* commit '9c1c62aea21a91f7dbb6a9153d3402eb9ed90f32':
  Amending testcase to support updated memory requirement for L.