tree 0e308bd86a4b9366811b25addbc54ee648c7608d
parent 06b1de25afb1a2bfce1cfc38a88584efc7d73c2f
parent 0a0ceba3c7a7cd3bcc11148beddef4e0034e80c4
author TreeHugger Robot <treehugger-gerrit@google.com> 1464282443 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1464282444 +0000

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