tree 00c9b97fac2aa3d1c7f11a08da7a6f049eeb7056
parent dbb919b8b1bfdf2a3fefcb2de1d403f2bb093152
parent 7a8e8880b85099998085435d6d4f8f8ef058c9f5
author Geoff Mendal <mendal@google.com> 1452010670 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1452010670 +0000

Merge "Import translations. DO NOT MERGE"