commit | 0c1ee9540cbb62dfc99dcf2eacb08909835ada44 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 15 15:58:00 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 15:58:00 2015 +0000 |
tree | f2601ce422fdc98709922eb7bf96809df0e3f40b | |
parent | 1a9e0c950eac973eba5416ff0632dec558f35f7f [diff] | |
parent | b4ac0141b01d98f0d750d9303a670b17e2f76f37 [diff] |
am b4ac0141: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'b4ac0141b01d98f0d750d9303a670b17e2f76f37': Import translations. DO NOT MERGE