OSDN Git Service

am 469fa946: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Sat, 29 Aug 2015 22:41:40 +0000 (22:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 29 Aug 2015 22:41:40 +0000 (22:41 +0000)
* commit '469fa946132b34165ea014e2eef7cd94f59171c1':
  Import translations. DO NOT MERGE


Trivial merge