tree 985937655234bf0f48cecb36793fac846911244f
parent a8b9a8c1ed5e7d7e0cdc39c2c10f964b95a98e7a
parent ffd4fee911ee43fbec7b08b829d15a7593421dba
author Justin Harrison <astyrrian@google.com> 1423859009 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423859009 +0000

am ffd4fee9: Merge "Revert "Allow system images larger than 2GiB."" into lmp-mr1-dev

* commit 'ffd4fee911ee43fbec7b08b829d15a7593421dba':
  Revert "Allow system images larger than 2GiB."