| commit | 23ba1a7f7ecefc9e1acc847b414a0c19e771d205 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Fri May 04 14:25:48 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 04 14:25:48 2012 -0700 |
| tree | 4c0e1e5efdf17780469ab89ffee11e4b52acd099 | |
| parent | 68ee74e51566086852a0b200c8dd9334fee16bcf [diff] | |
| parent | bb0884930846f90e9578557f774d1de01d335174 [diff] |
am bb088493: (-s ours) am f10b0669: Merge "Import translations. DO NOT MERGE" into jb-dev * commit 'bb0884930846f90e9578557f774d1de01d335174': Import translations. DO NOT MERGE