OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 9dbd07ef32 -s ours...
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 9 Aug 2017 16:36:16 +0000 (16:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Aug 2017 16:36:16 +0000 (16:36 +0000)
commit1ce17f356b7436d1eac51390293f06c4b419275c
tree6f78abf4f36aba4d7235157f21acf48af3d6bccd
parent6f2e323c657447c268c50f8ef4448b114dd48ca5
parent0a4c07d3723a6e4d11328cc1e29a3f31b886aae4
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 9dbd07ef32  -s ours am: 87ed2a3a15  -s ours
am: 0a4c07d372  -s ours

Change-Id: I89861002fa49c558fab5ab7e3dbfb3c94181697d