tree a4583c525dd13a1e51a3c070875b946a17d90085
parent ca66be9e0ef691a4c8ccd5c7da7e07e618e9bb85
parent 062ddcd116ad496bbbdc02f42b252a43c6c5ae0c
author Geoff Mendal <mendal@google.com> 1413424108 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1413424109 +0000

Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev