OSDN Git Service

am e9a8f465: (-s ours) resolved conflicts for merge of 0287a8f6 to lmp-mr1-ub-dev
authorKonstantinos Menychtas <kmenychtas@google.com>
Tue, 25 Aug 2015 18:22:28 +0000 (18:22 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Aug 2015 18:22:28 +0000 (18:22 +0000)
commitca19158e034d6e0f5a605698c0f303893a2b9248
treeabc69f7fde57d633224d9fa576ff70882e9cea6a
parented7e864a735f004f1dbb4a2db5261855b5693913
parente9a8f465859137ba37786031b804864205900cb4
am e9a8f465: (-s ours) resolved conflicts for merge of 0287a8f6 to lmp-mr1-ub-dev

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