| commit | 4ecfeea4b725e08151cd1071f5e0eaf7841d990b | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Wed Aug 01 15:17:54 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 01 15:17:54 2012 -0700 |
| tree | c4cfa2b3e7737b731dfabc7b2fb18850522ca82c | |
| parent | 956b3eef5b02612667f094ca48833aaab41cd937 [diff] | |
| parent | 71838e12beb2250ffd22959584248ebb33531332 [diff] |
am 71838e12: (-s ours) am ea22f0fc: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '71838e12beb2250ffd22959584248ebb33531332': Import translations. DO NOT MERGE