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:43:52 +0000 (16:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Jul 2016 16:43:52 +0000 (16:43 +0000)
commit1ef588bdc596573436e562c90b3239d31644f096
tree91e17e014c1eea8130a2ab018470c09fe3753e2d
parent9fde9f3e14f863e4b31912c47528eac9a7cb77ec
parent4ae2cc38033c36b99fc66897fb7282e03d7508eb
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 84c67fa304  -s ours
am: 4ae2cc3803  -s ours

Change-Id: I6b9e92250f1f101a1813685989b353a95784e176