OSDN Git Service

am ca19158e: am e9a8f465: (-s ours) resolved conflicts for merge of 0287a8f6 to lmp...
authorKonstantinos Menychtas <kmenychtas@google.com>
Tue, 25 Aug 2015 18:30:57 +0000 (18:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Aug 2015 18:30:57 +0000 (18:30 +0000)
commitd2524d00c284e1c7d3735d6ce49e49ed90d223fc
tree17b8f7a9223cefd00be6a6a649a951eb3b58078f
parentc9343c0bc316536772700926d555be42783fac62
parentca19158e034d6e0f5a605698c0f303893a2b9248
am ca19158e: am e9a8f465: (-s ours) resolved conflicts for merge of 0287a8f6 to lmp-mr1-ub-dev

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