| commit | f3309d1905996031148f60eff4fcb80688970f28 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue Jun 19 13:27:21 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 19 13:27:21 2012 -0700 |
| tree | bf4d009126184e4ada863324672893b844f1eb85 | |
| parent | 0f2a9b8cd38dab7212234eb0e0d5f66d6f485ba6 [diff] | |
| parent | 2e3a1767f4e0b7769f0726795efba3a8f7c1de1f [diff] |
am 2e3a1767: (-s ours) am 8c93a140: Import translations. DO NOT MERGE * commit '2e3a1767f4e0b7769f0726795efba3a8f7c1de1f': Import translations. DO NOT MERGE