tree 11c7d665e29dd0ad274746d97449ee8dfba1d3fb
parent 5ad585e34d2d403adbf09b8d956c89d2f382459d
parent 2a0d2d423f4e1d40537e87577555058de76cdb83
author Geoff Mendal <mendal@google.com> 1417669382 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1417669383 +0000

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