OSDN Git Service

am 02e57212: (-s ours) am e2ff12bf: DO NOT MERGE Bump version string.
authorJustin Koh <justinkoh@google.com>
Tue, 12 Aug 2014 23:18:28 +0000 (23:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 12 Aug 2014 23:18:28 +0000 (23:18 +0000)
* commit '02e572124860ad8588c65bb011f01fa9e8c37018':
  DO NOT MERGE Bump version string.


Trivial merge