OSDN Git Service

Merge "Import translations. DO NOT MERGE am: e1d30cc8b4 -s ours am: f127a35e6b ...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Wed, 4 May 2016 01:47:49 +0000 (01:47 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 4 May 2016 01:47:49 +0000 (01:47 +0000)
commitf90d0338a5844a079f62cbff5fa7ee48f406afbb
tree3586958550f5204fac7a640be3649c19a754fa7b
parentde0ded3a57e99ada0f524f5fa38b592a2d2422ea
parent6a970b65c9caf07241d41626aedff45cb2f95b09
Merge "Import translations. DO NOT MERGE am: e1d30cc8b4  -s ours am: f127a35e6b  -s ours" into nyc-mr1-dev-plus-aosp