OSDN Git Service

am 78819ec3: (-s ours) am f62af382: (-s ours) am 5b7e25aa: (-s ours) Merge "Import...
authorGeoff Mendal <mendal@google.com>
Thu, 23 Oct 2014 22:24:09 +0000 (22:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Oct 2014 22:24:09 +0000 (22:24 +0000)
* commit '78819ec30af2139b04bd39dde35fbbe3eaf33bae':
  Import translations. DO NOT MERGE


Trivial merge