OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE am: 6cf2d99816 -s ours am: cc298f9ae...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Thu, 20 Jul 2017 20:10:56 +0000 (20:10 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 20 Jul 2017 20:10:56 +0000 (20:10 +0000)
commit6c3edcd1189d02f459d1798a6cd86d2f1e865eca
tree2af03241570f707d4cc9676cdd1cc2c2cfc23ecb
parent2929aa2069ba9d8eb58abe9fb8e2729994ab9b54
parentbeb1dab80306227f961fa4f38d73d5ec85409d10
Merge "Merge "Import translations. DO NOT MERGE am: 6cf2d99816  -s ours am: cc298f9ae6  -s ours" into oc-dr1-dev-plus-aosp am: 8746483a7c  -s ours" into oc-mr1-dev-plus-aosp