OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: a3bdce963f -s ours
authorBill Yi <byi@google.com>
Wed, 2 Aug 2017 22:16:53 +0000 (22:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Aug 2017 22:16:53 +0000 (22:16 +0000)
commit97d8360fc5c2be88ce0651a10a699604dceb6a04
tree8dbe1b0575eb1163e4438c9366818d68d7e3ec2d
parent290200b2a7a1d4f388b69c6e145203ea599d1b0c
parent52498c1da9d278e6d866edc07d701f8d99bf4571
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: a3bdce963f  -s ours
am: 52498c1da9  -s ours

Change-Id: Ibbca1b09b50102ece59623530bfe131610449c8d