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)
* commit 'e9a8f465859137ba37786031b804864205900cb4':
  Increasing all emulator system image sizes


Trivial merge