OSDN Git Service

am 78f313b5: (-s ours) am 88b4a0ac: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 05:31:30 +0000 (05:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 05:31:30 +0000 (05:31 +0000)
* commit '78f313b5b266bbc66d44f12b047dedb4a27cf95c':


Trivial merge