OSDN Git Service

am 5e183ac6: (-s ours) am bd64cd59: (-s ours) am 35d2cf1c: (-s ours) am b4a027d0...
authorGeoff Mendal <mendal@google.com>
Wed, 7 Oct 2015 12:56:58 +0000 (12:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 7 Oct 2015 12:56:58 +0000 (12:56 +0000)
commitc5f66d7e8488b6c5a46e2600ae399a898cd67945
treed3995dd00245a4e3ac13e31c3199e5d0a7a86b59
parent714bc28b9200680cc4333c00a803711b28f9537b
parent5e183ac6608eb5aca32a2a2835cd321217b451fb
am 5e183ac6: (-s ours) am bd64cd59: (-s ours) am 35d2cf1c: (-s ours) am b4a027d0: (-s ours) Import translations. DO NOT MERGE

* commit '5e183ac6608eb5aca32a2a2835cd321217b451fb':
  Import translations. DO NOT MERGE