| commit | 46d51c68b2b1a90e638d2135e204dc51768d5628 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Mon Jun 18 10:52:40 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 18 10:52:40 2012 -0700 |
| tree | f3ffde1d69c1db5f941e5b7e4ea3071a802920ef | |
| parent | 5184bca140f81962a698c4d003f47f4699018d96 [diff] | |
| parent | 90e71542d1307a3b142509ee658304920d1b3f3d [diff] |
am 90e71542: (-s ours) am c66604cb: Import translations. DO NOT MERGE * commit '90e71542d1307a3b142509ee658304920d1b3f3d': Import translations. DO NOT MERGE