tree 9acc75e05ce23d23c484415add63b5ff665c7a63
parent 9351ba5339e08e82b0f3704f39d3c84126023ecf
parent 8f2594aa4e60be04bcae6b10c2e5fe9159a8050b
author Geoff Mendal <mendal@google.com> 1401294881 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1401294881 +0000

Merge "Import translations. DO NOT MERGE"