| commit | f994f353f705dc69c1e57bd6785092218fd630d2 | [log] [tgz] |
|---|---|---|
| author | Justin Ho <justinho@google.com> | Fri Feb 10 10:13:19 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 10 10:13:19 2012 -0800 |
| tree | 190cbe0fd993f9fb085c02f4e52d7520918df1de | |
| parent | b45087bf09921dd515e83804d821f127d8b790c6 [diff] | |
| parent | 448249d1a7e0b871b9a9db49a45e0e51f6d36d65 [diff] |
am 448249d1: (-s ours) am 744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1 * commit '448249d1a7e0b871b9a9db49a45e0e51f6d36d65': Import translations. DO NOT MERGE