tree d6c4a0e0f0eef95ef2150e613fff4c4115261579
parent 8b01ac4a591d2f93321f692675a1dba29d48f7b5
parent 48fe5b7cadca3c945e81182411e9537cb11d81d3
author Tao Bao <tbao@google.com> 1426800620 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426800620 +0000

am 48fe5b7c: am fc267120: am b7e5ab6f: Merge "Allow system images larger than 2GiB."

* commit '48fe5b7cadca3c945e81182411e9537cb11d81d3':
  Allow system images larger than 2GiB.