commit | 498cd4f4fe63c8feb6e4e2b48c163c721d2f3dd9 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Nov 16 10:36:35 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 16 10:36:35 2012 -0800 |
tree | b6f5c16672609c4e25cb5bf5ca0a71d432f0dd3c | |
parent | 3639beff7a2b2c07cd0b96ca9bcca0b0ef31543f [diff] | |
parent | 9d6cf4e1c3de8415c3c466ac940cafe0d867a4f3 [diff] |
am 9d6cf4e1: (-s ours) am f118bcc5: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit '9d6cf4e1c3de8415c3c466ac940cafe0d867a4f3': Import translations. DO NOT MERGE