tree 8e9dc9095ee8c0f390bbbfdfedb6a1e19f532211
parent b72ae7a8f33355b4351e53e7c607b4fff81d22fb
parent 6536f65afb4d4806786ca3fe11955bdbdb4f2f5a
author Geoff Mendal <mendal@google.com> 1426919826 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1426919827 +0000

Merge "Import translations. DO NOT MERGE"