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