OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-dev
authorBill Yi <byi@google.com>
Tue, 14 Jun 2016 12:21:19 +0000 (12:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 14 Jun 2016 12:21:19 +0000 (12:21 +0000)
commit933d21c9ea1f5045abf6280bd3156a6b6fb9612e
tree67cdaebb2bd317c6d5d6aa0d046cf72ab42dd8f7
parent2ff49263622f5fec277610a3277afc20a863d859
parent7ce75172ddb1c6535bdf3f7f7bc84f65d681e958
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 7ce75172dd  -s ours

Change-Id: Ie8451e38f89fedd49445ff91b1d01fe93177292b