From: Konstantinos Menychtas <kmenychtas@google.com>
Date: Tue, 25 Aug 2015 18:30:57 +0000 (+0000)
Subject: am ca19158e: am e9a8f465: (-s ours) resolved conflicts for merge of 0287a8f6 to lmp... 
X-Git-Tag: android-x86-7.1-r1~608^2~19^2~204
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d2524d00c284e1c7d3735d6ce49e49ed90d223fc;p=android-x86%2Fbuild.git

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
---

d2524d00c284e1c7d3735d6ce49e49ed90d223fc