tree d3f47dd1d58af3669ed73dbde485384a5c8e8538
parent b8224b35269ff3848ca3bf6808bd4171691706a9
parent d6a70de3ae7b6bf8ab3e986db811c02d03511836
author Geoff Mendal <mendal@google.com> 1450273895 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1450273895 +0000

Merge "Import translations. DO NOT MERGE"