tree 9f58034024c80bbb921f92b6db287f2074641d4e
parent ffada671db0fefd98464185651ead1b78df00f21
parent 3765ae9ff1a7584623f5f4c69d50bdf011664f81
author Geoff Mendal <mendal@google.com> 1415037444 +0000
committer android-build-merger <android-build-merger@google.com> 1415037444 +0000

am ef8c3cc4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
automerge: 3765ae9  -s ours

* commit '3765ae9ff1a7584623f5f4c69d50bdf011664f81':
  Import translations. DO NOT MERGE