tree abc69f7fde57d633224d9fa576ff70882e9cea6a
parent ed7e864a735f004f1dbb4a2db5261855b5693913
parent e9a8f465859137ba37786031b804864205900cb4
author Konstantinos Menychtas <kmenychtas@google.com> 1440526948 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440526948 +0000

am e9a8f465: (-s ours) resolved conflicts for merge of 0287a8f6 to lmp-mr1-ub-dev

* commit 'e9a8f465859137ba37786031b804864205900cb4':
  Increasing all emulator system image sizes