tree fb31ad8a2b0f80ede0fc88ff24dde2caa4ddb70e
parent ae284e6cb643236be307e78960e976d8266e8d2c
parent 650a11a2dd4176743484a9bef4da52b06a2836b8
author TreeHugger Robot <treehugger-gerrit@google.com> 1464666870 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1464666871 +0000

Merge "Import translations. DO NOT MERGE" into nyc-dev