OSDN Git Service

am 8474bf48: (-s ours) am 8320436c: (-s ours) Merge "Revert "Import translations...
authorGeoff Mendal <mendal@google.com>
Mon, 1 Jun 2015 15:25:42 +0000 (15:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 15:25:42 +0000 (15:25 +0000)
* commit '8474bf48aa37487270e335441005cea19515cf13':
  Revert "Import translations. DO NOT MERGE"


Trivial merge