tree 02cd6668805200336e1f80559ed4a7d80b9dbe7d
parent 10dced7a92fd3bc26284efdfaacdea2610cc3bed
parent cf1f2ea5a7945dc4982b1e41197af94ad64e8f37
author Geoff Mendal <mendal@google.com> 1430751230 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430751230 +0000

am cf1f2ea5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'cf1f2ea5a7945dc4982b1e41197af94ad64e8f37':
  Import translations. DO NOT MERGE