tree 2aac72a5e6d8d4965c8b94cd85149a0f2dee52d8
parent 0b22e395d24cba14d4113fb326bfcb57c6aa5996
parent e333ef546e0ad2611c0dbcbe5e4dbe1301144bdd
author Geoff Mendal <mendal@google.com> 1418829748 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1418829750 +0000

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