| commit | 76fb4bd31a7461f93d1beda9cec009097775b322 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Fri Mar 18 16:55:12 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 18 16:55:12 2011 -0700 |
| tree | 65c72a4036595fe03379b499bca2b7307551c5b0 | |
| parent | d48ee36e26a121ba528a56a4a01af22d9ff71679 [diff] | |
| parent | 684f1cf41bd48cadc94dc5f3f20d6fdadd5c1640 [diff] |
am 684f1cf4: resolved conflicts for merge of 6a1413b1 to gingerbread-plus-aosp * commit '684f1cf41bd48cadc94dc5f3f20d6fdadd5c1640': Import revised translations. DO NOT MERGE