OSDN Git Service

am 109e329b: (-s ours) am 28a4f1fd: (-s ours) am 568c167b: (-s ours) am 8b046c1a...
authorGeoff Mendal <mendal@google.com>
Tue, 4 Aug 2015 01:33:17 +0000 (01:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 4 Aug 2015 01:33:17 +0000 (01:33 +0000)
* commit '109e329bbd43aadfa921fa8d34089099b5a7d233':
  Import translations. DO NOT MERGE


Trivial merge