commit | 97c5ec685e880538654166cadf2939bf2fa548d3 | [log] [tgz] |
---|---|---|
author | Eric Fischer <enf@google.com> | Tue Jun 05 09:22:04 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 05 09:22:04 2012 -0700 |
tree | 272aa7d1c5a173b1b9cbc23309b4d4ee5fdcb02d | |
parent | 46cc408094007ae6019afef2aaa31c49983ff47c [diff] | |
parent | 89b5872a88ed8e0623263957a0c4b25c5d4a5b69 [diff] |
am 89b5872a: (-s ours) am fe3358af: Import translations. DO NOT MERGE * commit '89b5872a88ed8e0623263957a0c4b25c5d4a5b69': Import translations. DO NOT MERGE