| commit | 630ca22865d64fe67d29987a55456085badbc9e2 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue Apr 30 14:05:21 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 30 14:05:21 2013 -0700 |
| tree | ab989a58a37927754311fb8421b73f900930b71e | |
| parent | 4f7d1537580fa772de0ef354c1fd4ce1f3b19436 [diff] | |
| parent | 12f7f48460f5ee9f574379fcc09642e9895b912a [diff] |
am 12f7f484: (-s ours) am 85eee52a: am 257de1d9: (-s ours) Import translations. DO NOT MERGE * commit '12f7f48460f5ee9f574379fcc09642e9895b912a':