tree 049add31f15db4d96335a1685016a80811690ef5
parent b8e8746e23a5bedc517eef7eccac9c5e74816e3f
parent 9ad72222be1fee8dd4036bf8ecc2316f56446aa0
author Geoff Mendal <mendal@google.com> 1429705191 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1429705192 +0000

Merge "Import translations. DO NOT MERGE"