OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: 5acdc8c3d5 -s ours
authorBill Yi <byi@google.com>
Thu, 30 Mar 2017 01:46:23 +0000 (01:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 30 Mar 2017 01:46:23 +0000 (01:46 +0000)
commitdb1251e16905e349a41137f02007daac2f720f44
tree0e2fc30d76c6afe0a7cce032b10e39cd8ea41ecd
parente395290b4157aabf4a846ea799eb3db46923e6c5
parentbcd06fab1db8c4cd783ef67ef933d6dd1f3222c8
Merge "Import translations. DO NOT MERGE" into oc-dev am: 5acdc8c3d5  -s ours
am: bcd06fab1d  -s ours

Change-Id: If192805c88157baf69e8be9c55009145648b5e63