OSDN Git Service

am 8b046c1a: (-s ours) am c493f042: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Tue, 4 Aug 2015 01:08:47 +0000 (01:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 4 Aug 2015 01:08:47 +0000 (01:08 +0000)
commit568c167b3c99f628165c823f1c5b0cacf8a462a2
treee27a137dbac1a4bb06aa29f616554fa992775741
parent7ddac827941c2a4f493b105527eb2728d619f270
parent8b046c1a4d34873a1e587769fd79f6777836a2a3
am 8b046c1a: (-s ours) am c493f042: (-s ours) Import translations. DO NOT MERGE

* commit '8b046c1a4d34873a1e587769fd79f6777836a2a3':
  Import translations. DO NOT MERGE