| commit | d0aebd900913a6308398f088e32b83fb9f3bb700 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Mon Jun 18 13:01:45 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 18 13:01:45 2012 -0700 |
| tree | d00bf6924daa8b9ef0102e05bb62abb86082e15b | |
| parent | fce27d8edd1ef0bc283ac0053cab0261f2cd9929 [diff] | |
| parent | a5bcf814166b68ac0cec0d76acb61d49c2e03dc2 [diff] |
am a5bcf814: (-s ours) am c4947277: Merge "Import translations. DO NOT MERGE" into jb-dev * commit 'a5bcf814166b68ac0cec0d76acb61d49c2e03dc2': Import translations. DO NOT MERGE