| commit | 39d35d3478dca214f6f494a3915384adacdb7040 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue Apr 05 10:27:58 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 05 10:27:58 2011 -0700 |
| tree | 65c72a4036595fe03379b499bca2b7307551c5b0 | |
| parent | 24e8c6cb897eeee16b05b897ece23894be025d8b [diff] | |
| parent | 2f860f1536a53b4dc49bfa1792d2ca56ecc03309 [diff] |
am 2f860f15: (-s ours) am 63fff9c7: resolved conflicts for merge of 3a6928aa to gingerbread-plus-aosp * commit '2f860f1536a53b4dc49bfa1792d2ca56ecc03309': Import revised translations. DO NOT MERGE