| commit | dd2a97e3aea47e70b1669af54593bf165c1cb899 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue Jun 19 14:47:53 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 19 14:47:53 2012 -0700 |
| tree | a1c6238a6c85cc7d54b4613d31663b403029e8c9 | |
| parent | 579c373bdc79ab730e307b71a4364944f4916487 [diff] | |
| parent | 7324b21ca07c89c01fd4bfea6c2d651c3e31146a [diff] |
am 7324b21c: (-s ours) am c2585467: Merge "Import translations. DO NOT MERGE" into jb-dev * commit '7324b21ca07c89c01fd4bfea6c2d651c3e31146a': Import translations. DO NOT MERGE