OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: 6b1ff7073a -s ours
authorBill Yi <byi@google.com>
Fri, 23 Jun 2017 12:48:51 +0000 (12:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Jun 2017 12:48:51 +0000 (12:48 +0000)
commit16ec3c30e5bee7c0d016307ff848caa1f237c415
tree3d8cc9cd2493904e4ae43551114f1625bb939a50
parentd570ab15950554321c0ded9258a7167d0961bd18
parent5386943cf2bce16c7a8e53a818c8abb81043966d
Merge "Import translations. DO NOT MERGE" into oc-dev am: 6b1ff7073a  -s ours
am: 5386943cf2  -s ours

Change-Id: Ib26efa4af930a2e9aa369e3afc1ec7cc57c065ab