commit | 25d1d268c1b00734f4bdd7fcb85ced97645a7f29 | [log] [tgz] |
---|---|---|
author | Justin Ho <justinho@google.com> | Fri Feb 10 10:49:48 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 10 10:49:48 2012 -0800 |
tree | 190cbe0fd993f9fb085c02f4e52d7520918df1de | |
parent | f994f353f705dc69c1e57bd6785092218fd630d2 [diff] | |
parent | 0fc225ed37ec535ff9b5238f390a79dbaf7f377b [diff] |
am 0fc225ed: am 744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1 * commit '0fc225ed37ec535ff9b5238f390a79dbaf7f377b':