OSDN Git Service

am 4813fcdd: (-s ours) am c22f63a7: (-s ours) am a6e09c12: (-s ours) am 237abb0a...
authorGeoff Mendal <mendal@google.com>
Tue, 7 Oct 2014 01:03:43 +0000 (01:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Oct 2014 01:03:43 +0000 (01:03 +0000)
* commit '4813fcdd98041a39d0a55ac4a5feadd27ea72194':
  Import translations. DO NOT MERGE


Trivial merge