| commit | a510985496d47ef6fecaa1b00ed8384d496b2322 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Wed Jun 06 11:06:13 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 06 11:06:13 2012 -0700 |
| tree | 8f102b7d6f3ee47838959fb9aef1f1a6e70e731d | |
| parent | 8be70c9176a9dc70d77b259e857d3beb13cff524 [diff] | |
| parent | 6edae671aa8f5da345420185f7ecd61fe2d2e6dd [diff] |
am 6edae671: (-s ours) am 699ef52c: Import translations. DO NOT MERGE * commit '6edae671aa8f5da345420185f7ecd61fe2d2e6dd': Import translations. DO NOT MERGE