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