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:31:01 +0000 (18:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Aug 2015 18:31:01 +0000 (18:31 +0000)
commit3b8b865734cf457ffa9ff70c3f2b8bb507d1f4fb
treecd872cef5ec386118d0f8684436acf25815487cc
parent15bb28fc73fa30e9c7b8ee0d924c8906724809e0
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