OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7905adb795 -s ours am...
authorBill Yi <byi@google.com>
Fri, 5 Aug 2016 18:00:50 +0000 (18:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 Aug 2016 18:00:50 +0000 (18:00 +0000)
commit5e8aa6936d79f6159f1313386bbe630261f7f741
tree42507996f9edeea2c626778c4737715edbcf8d16
parent7e2b5d63b46f8948869fcabdc68c336210dedc0b
parent486a33139272f03adc9fcb9055b9a7d0df6e591e
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7905adb795  -s ours am: 31f38f5558  -s ours
am: 486a331392  -s ours

Change-Id: I1c2a9ebe6530b9d7da09f6f4e4fd406c67f38aca