tree 2926bceeaa8c8901606b1329a86fab85c77f6509
parent 503a7514f69340b2190ba03f1fad87a3af3c8b24
parent dc2a365170e1bfb9c21ee0eb0a21e2149785e2d0
author TreeHugger Robot <treehugger-gerrit@google.com> 1469668115 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1469668115 +0000

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