tree 357265cad94a3b04006b29059b87f79fe4a94930
parent 29dd07b26903815f9463b62971c8cbe640a22437
parent 516298896931b596b3769d7b2fd922acea6e4ecb
author Geoff Mendal <mendal@google.com> 1440876724 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1440876724 +0000

Merge "Import translations. DO NOT MERGE"