OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 1b93d5c5a1 -s ours
authorBill Yi <byi@google.com>
Sat, 5 Nov 2016 06:49:49 +0000 (06:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 5 Nov 2016 06:49:49 +0000 (06:49 +0000)
commit38fa537dc0d46f9144bfd417991bb56cf51fa618
tree0eb43f46f7d791b8f3520dbe3362b32186faca1c
parent2a98ad003bdc9a283df1c5fda86efb985fcab148
parent8e4618bca6be09b5def7deffc0ed4629c9fcb3ff
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 1b93d5c5a1  -s ours
am: 8e4618bca6  -s ours

Change-Id: Ibfdf60ceeade0025ec643e04bf675cca752f5990