OSDN Git Service

Merge "Import translations. DO NOT MERGE am: 2f525fbdc5 -s ours am: f8c9a63ca6 ...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 1 Aug 2017 18:18:27 +0000 (18:18 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 1 Aug 2017 18:18:27 +0000 (18:18 +0000)
commit8c3d164113311a4bef0f97ac3dd0ef47296a4a56
treea7d3e43097c9fa1ea6eec4dead7c655fc75012e6
parent8c0d932862be397bbdfebe08089247d4e63de953
parent6f76c3b39fee987d4b43a0e7ef7a5ae013d73f25
Merge "Import translations. DO NOT MERGE am: 2f525fbdc5  -s ours am: f8c9a63ca6  -s ours" into oc-mr1-dev-plus-aosp