tree f2d755d68607719e23ac3043908d59b72ba573e0
parent dc74b380409ac9d78cdd19eb28c203ebeb8db5aa
parent 0396b10235ece43be797e48673ec05c4cf4c74d7
author Colin Cross <ccross@android.com> 1396460694 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396460694 +0000

am 0396b102: am 578f7ec4: am 45db0e05: Merge "aosp_arm64: increase userdata image size"

* commit '0396b10235ece43be797e48673ec05c4cf4c74d7':
  aosp_arm64: increase userdata image size