OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Sat, 29 Apr 2017 18:05:56 +0000 (18:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 29 Apr 2017 18:05:56 +0000 (18:05 +0000)
commitb40d693aba1e8834235a60ab7251a8f08a7eaa32
tree72970278195122685bfbd1d71343f8aae837cf2f
parent5acb03575faf8e98ddddd22cc9df2490aa34a02e
parent0ee4e7df8ebecb0beb95582efb07b1fefb98bb4b
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 0ee4e7df8e  -s ours

Change-Id: I47fd4022a9ba5a639e35c011f83a32559bfaefaa