commit | 276ed0d6a75e8ed2201ebf7adc2e0bcb410ae0c3 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Wed May 01 20:50:10 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 01 20:50:10 2013 -0700 |
tree | 2267a981fa35f4ae8e75263428a9bcd4e67c282d | |
parent | 11d4d240816659a91452f3e8c9df6b07443ed2fe [diff] | |
parent | 9e0ffd35a534ee5c2f81bcb2685fd997243ea406 [diff] |
am 9e0ffd35: (-s ours) am f9a4732e: (-s ours) am f7e4057f: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '9e0ffd35a534ee5c2f81bcb2685fd997243ea406': Import translations. DO NOT MERGE