OSDN Git Service

am b455b071: (-s ours) am e8d21649: (-s ours) am 69309ffd: (-s ours) am 1b9926df...
authorGeoff Mendal <mendal@google.com>
Tue, 5 Aug 2014 01:46:16 +0000 (01:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 5 Aug 2014 01:46:16 +0000 (01:46 +0000)
* commit 'b455b0717890a596fc12878925c8906e44b67740':
  Import translations. DO NOT MERGE


Trivial merge