| commit | e0058621949fcd30c5962e28c3b881b315cae368 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Oct 31 17:34:12 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 31 17:34:12 2014 +0000 |
| tree | aa7f567d65a36a8581e819ef8e3e54b82f0f77e5 | |
| parent | d689c76e2335869538fb0fbd61d6bca63f765634 [diff] | |
| parent | 40653ae9bb9e3e5bd647ce8da9ab0b095bde6849 [diff] |
am 40653ae9: (-s ours) am f82c5022: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit '40653ae9bb9e3e5bd647ce8da9ab0b095bde6849': Import translations. DO NOT MERGE