tree 7c363266fd535a21f7db6815f3fd4dcbe60344e1
parent ea8d08ac8f147535caec8226793eb2577ccda15b
parent 2145b3925a5c965e8c07461dd6e1725f8fcd1379
author Geoff Mendal <mendal@google.com> 1417729623 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417729623 +0000

am 2145b392: (-s ours) am 7b79c351: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '2145b3925a5c965e8c07461dd6e1725f8fcd1379':
  Import translations. DO NOT MERGE