commit | 7fe0ea4218a2ca1c663076d8e52ffeb7d842ecc4 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Oct 31 17:07:42 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 31 17:07:42 2014 +0000 |
tree | 35177ce3c6cf8d873ea0f220bd9dc71fa69105f3 | |
parent | a42c4a83664c47a6ddd081d9bb7b2fdb3c07bd9e [diff] | |
parent | f8de10ce2163343ab4b39b762bb1e6b5a4449069 [diff] |
am f8de10ce: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit 'f8de10ce2163343ab4b39b762bb1e6b5a4449069': Import translations. DO NOT MERGE