tree a69600ce63ec2a9e5a228b1b5d047d0b2072523b
parent 6685bd01a953a550f0cebe342e9a1125adffd6b3
parent 5411ef9cc4a4bf5c1950df89f2b2032edcf83dc8
author Nick Kralevich <nnk@google.com> 1373667333 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1373667333 -0700

am 5411ef9c: Merge "emulator: increase system partition size to 400M"

* commit '5411ef9cc4a4bf5c1950df89f2b2032edcf83dc8':
  emulator: increase system partition size to 400M