tree e4218fca6f18ee65ffc3e53bcd2804bb31f8399e
parent 5c7e4d99402bf0440ebd6713b6680f8abea175a3
parent 4e7f6a425c5db47bfea4d5e00961837bf4805b29
author Geoff Mendal <mendal@google.com> 1423782016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1423782017 +0000

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