tree cee7fcb53af04315a63df63f9f350881d5da7fc8
parent 87492b889d2d90512c1e7129e3e5d04339d9e0e2
parent c055f9b51a67de39a2fd384d3d974b9b8566884e
author Ian Pedowitz <ijpedowitz@google.com> 1439330776 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439330776 +0000

am c055f9b5: am e5a63158: Merge "Increasing arm(64)? emulator partition sizes to 1.5GB" into mnc-dev

* commit 'c055f9b51a67de39a2fd384d3d974b9b8566884e':
  Increasing arm(64)? emulator partition sizes to 1.5GB