tree 23ec50f583becb30a6035b13861914568296e326
parent 77a07ca30b912adec167b58cd81fdc03fab3428c
parent 5a238464dd37cd6d697d2d907a67cc4784dfefe3
author TreeHugger Robot <treehugger-gerrit@google.com> 1467778485 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1467778486 +0000

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