tree eb37d3350a10fb324cda3fb11af4c533554b98b3
parent dfb29da864437e492405b1d0de0d8af05995859a
parent 112f4c07c7de4bdb28aeb150233b24e7b1463f86
author Ian Pedowitz <ijpedowitz@google.com> 1439321584 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439321584 +0000

am 112f4c07: am 0150dae6: am 073f74d9: Merge "Increasing x86 emulator system partition size" into mnc-dev

* commit '112f4c07c7de4bdb28aeb150233b24e7b1463f86':
  Increasing x86 emulator system partition size