tree 0135649041e49f0a2888bc77e76b772cac205e30
parent 1cc7738bfeb5c79d84caa48b01daf5099f62618e
parent ca0fad438cffc4b5f4adfe1abc6fcd2a503a4bd6
author Bill Yi <byi@google.com> 1470421108 +0000
committer android-build-merger <android-build-merger@google.com> 1470421108 +0000

Merge "Import translations. DO NOT MERGE" into nyc-dev
am: ca0fad438c  -s ours

Change-Id: Ibcb0a9ec50ef2fbdb42b8a9a7df04530700bc27d