tree f2937a649a60cd15244b64a1d45b97d5ff9e4d14
parent a312f7f8044a07a2a41de477cc30bb34fc1df55f
parent b0c0f773cea77e62899b79de9255f7a3b1c06624
author Geoff Mendal <mendal@google.com> 1413238450 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1413238450 +0000

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