OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 2 May 2017 15:59:49 +0000 (15:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 2 May 2017 15:59:49 +0000 (15:59 +0000)
commitad5649043e62de57df491e48757e87cbbd3d71aa
tree6043a442a2799b30ff75c0114f95a8ba2b252331
parentf921f8e77ede4615f1fe74efeb196ec2107c3d36
parent23550fdcd3810790aaf84e40c79667c2957771f9
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 23550fdcd3  -s ours

Change-Id: I8a79bee09818497cf509369a673377bf623b1fb8