From: Justin Koh <justinkoh@google.com>
Date: Tue, 12 Aug 2014 23:27:38 +0000 (+0000)
Subject: am a5a68343: am 02e57212: (-s ours) am e2ff12bf: DO NOT MERGE Bump version string.
X-Git-Tag: android-x86-6.0-r1~144^2~678
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b993df142b82bcf5c8a9d66cf204376ff683e5ff;p=android-x86%2Fbuild.git

am a5a68343: am 02e57212: (-s ours) am e2ff12bf: DO NOT MERGE Bump version string.

* commit 'a5a6834392f1467eb95210e53ffd270001fff2bf':
  DO NOT MERGE Bump version string.
---

b993df142b82bcf5c8a9d66cf204376ff683e5ff