commit | 4d0e5e0e152a91ccc63a382a9a8da8d21b16452d | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Wed Nov 07 18:29:10 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 07 18:29:10 2012 -0800 |
tree | 6cf582c2685f564b126cfdf02897266f4b64b149 | |
parent | 1f6cf5fade6021c1ce788541ec4a60ee36d20651 [diff] | |
parent | db60b67533f0e8e0366a926204bc852412285320 [diff] |
am db60b675: am fc958f12: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'db60b67533f0e8e0366a926204bc852412285320':