OSDN Git Service

Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 2bc13bcdad -s ours
authorBill Yi <byi@google.com>
Fri, 24 Jun 2016 05:57:49 +0000 (05:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 24 Jun 2016 05:57:49 +0000 (05:57 +0000)
commit7106fcc96b176b055b54f57e53d24dcd0517c8c6
tree89b3178274dcfef8963b95eb34bbddb9b9953882
parent17b41e14bca540a6e858b5d986bf20ef3fcbef37
parentb8f7854c9a8bf5adb4fec8114d29fdd32e4a4699
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 2bc13bcdad  -s ours
am: b8f7854c9a  -s ours

Change-Id: I71b65664e5aaa02b36d752a9b57c17281225f115