tree e1164e86a6c21fb227efd964bd0b15885698f126
parent 36eaa8690da761a4218a790e18858e4319ffa8d0
parent 5e14dc8426e867bea4afa7802f09d517050b683a
author Geoff Mendal <mendal@google.com> 1413418885 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1413418886 +0000

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