OSDN Git Service

Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: a2e1bb8c3e -s ours
authorBill Yi <byi@google.com>
Tue, 12 Jul 2016 16:38:15 +0000 (16:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Jul 2016 16:38:15 +0000 (16:38 +0000)
commit9c96b1e11894976277b4374995ac8b8512b9997d
tree91e17e014c1eea8130a2ab018470c09fe3753e2d
parentcbdecf95fd1dbc61e55b9e39b3c39fd68c3ad8f4
parent7d8fe60299a4dcf5cd359a3185af5e4c57cb375b
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: a2e1bb8c3e  -s ours
am: 7d8fe60299  -s ours

Change-Id: Id36fc37ef69e00b795fee823fd86b1fecb9b6df1