commit | 6ccf3681365a4bfb5302a20cb8437cd4735e81a9 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Oct 06 22:35:45 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 06 22:35:45 2014 +0000 |
tree | df4827b701e3295c2379c36a8d859f130f895544 | |
parent | 1777f6d08d71ba792b12b3b0a440e4908feb41f1 [diff] | |
parent | dec34b5f3b674e9955202c7b1cb5ef00b628f37b [diff] |
am dec34b5f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'dec34b5f3b674e9955202c7b1cb5ef00b628f37b': Import translations. DO NOT MERGE