| commit | cd1f6fe9f3ff2b2dabbca00d46007eceb68d445c | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Fri Jun 01 11:04:25 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 01 11:04:25 2012 -0700 |
| tree | 8b77e5c54cfe19d17f45733897e818343560b658 | |
| parent | 555f21cb4b17a82930972850aa74e88bc17320eb [diff] | |
| parent | 180562b071c619af686beb76a40fb258e084a9fd [diff] |
am 180562b0: (-s ours) am 24bd050e: Import translations. DO NOT MERGE * commit '180562b071c619af686beb76a40fb258e084a9fd': Import translations. DO NOT MERGE