tree cd345754c55b49a5c445de72a3ba42206f0adbe8
parent 79dc65d08ea5c7729b2dc63e57e8123e7cc9c2c3
parent d027b6ac9583f1546daa0ac286f29ff9d0ad9073
author Geoff Mendal <mendal@google.com> 1395074066 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1395074066 +0000

Merge "Import translations. DO NOT MERGE"