commit | 640f170780764ee89382c55d0157a97cd4ce7413 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Mon Nov 26 09:25:41 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 26 09:25:41 2012 -0800 |
tree | 5ef23a8092804666d51029c4338a66166f7d5bf2 | |
parent | 9d662bd63aa2501651fcc9bff99783c1349c505b [diff] | |
parent | 06b17c53c0be1ec934d2d7813adc7311b9581d29 [diff] |
am 06b17c53: (-s ours) am a6009edd: am a722789b: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev * commit '06b17c53c0be1ec934d2d7813adc7311b9581d29': Import translations. DO NOT MERGE