commit | 00e4d7830cc7834efdcec2a35d130cbc89e16551 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Thu Oct 16 01:56:04 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 16 01:56:04 2014 +0000 |
tree | 58ef8125ba7dd0d31f8bc5010173054d2e9dc4ff | |
parent | d2b824887f9ec2e3448bd38aae58efbc4f178997 [diff] | |
parent | c71a7b3cb8eb1565c01caaf231773759ee63b4cf [diff] |
am c71a7b3c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'c71a7b3cb8eb1565c01caaf231773759ee63b4cf': Import translations. DO NOT MERGE