commit | ef3af6ecfb6c7a1caea1be614505a8bd1d03be94 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Oct 28 07:12:30 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 28 07:12:30 2014 +0000 |
tree | 83b76d149dd985d7087d90ca03a257d923c000a1 | |
parent | 9fbfcee5b4e63f3239c6628168e969d66376f3cd [diff] | |
parent | e421198d5e45d0b3cfe504647a44a930e6e41ab5 [diff] |
am e421198d: (-s ours) am 6d42abd6: (-s ours) am 0331c1fe: (-s ours) Import translations. DO NOT MERGE * commit 'e421198d5e45d0b3cfe504647a44a930e6e41ab5':