OSDN Git Service

Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 84c67fa304 -s ours
authorBill Yi <byi@google.com>
Tue, 12 Jul 2016 16:38:11 +0000 (16:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Jul 2016 16:38:11 +0000 (16:38 +0000)
commitcbdecf95fd1dbc61e55b9e39b3c39fd68c3ad8f4
tree91e17e014c1eea8130a2ab018470c09fe3753e2d
parent61d0e73419f7686b47b037deaa849518ecbc31f5
parentf25fae7ea516b7812eb788c23963cd98c3565539
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 84c67fa304  -s ours
am: f25fae7ea5  -s ours

Change-Id: I83d520d76aa9e4a285fc8b67cb14f7cb4e107fd6