OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-dev
authorBill Yi <byi@google.com>
Thu, 16 Jun 2016 10:26:32 +0000 (10:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Jun 2016 10:26:32 +0000 (10:26 +0000)
commitcf0bd1675cff5967094736522306c816ef4a5280
tree1d7c2400ddbece2fddc189abb5902941aed7ca29
parentc9ac672d85bd9fcadb4ce3b78da932ef953350de
parentd58da1be76b0d847ecd6ce734d1f4dcf5a7bd9a0
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: d58da1be76  -s ours

Change-Id: I8f6a3c344ce19bf7dbdf3882e393627ed8029d46