OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Thu, 21 Jul 2016 03:39:59 +0000 (03:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jul 2016 03:39:59 +0000 (03:39 +0000)
commit0a94845a7e7567132e09f6314ba96a96b0dbf2ab
treeb3348af0e2af1937f4ec317971714c153f9836df
parentdb8b36970cb479a05ec5072d03dee9de89841294
parentc1079364cb328a0753576fb863077aa6bafcd6d4
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: c1079364cb  -s ours

Change-Id: I7abd0a0cce9a39061be91be90e26585f2bb5f5a4