| commit | 6de9974673f0fbf348dc914ccc9afe442ec7299f | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Aug 14 20:35:55 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 14 20:35:55 2012 -0700 |
| tree | 7d48ece10ed4da5323ccaf861d1923cc0a30a335 | |
| parent | d09c6b68468d3316a557a979bc3ab9300984a64e [diff] | |
| parent | 0dd275ff44aa3d8303cb609e2b3814c99a8ea6b7 [diff] |
am 0dd275ff: (-s ours) am dc0405b4: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '0dd275ff44aa3d8303cb609e2b3814c99a8ea6b7': Import translations. DO NOT MERGE