OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: dd5886bc5b -s ours...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Thu, 8 Jun 2017 23:25:20 +0000 (23:25 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 8 Jun 2017 23:25:26 +0000 (23:25 +0000)
commit49bd4748e39769c56067568df2860a6a5a5f6d3e
treea4ed5d0b1b7d9efa0ffd33b4af247ccb006425d7
parent748604c1abe935f1139ada150f192803b64972c1
parent4ac28e513f0135c9c7ad9c0c5221fbf099db6158
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: dd5886bc5b  -s ours am: 4ec78fa17b  -s ours" into oc-dr1-dev-plus-aosp