| commit | 2eeddec9cc027144951ad061ae5a494a0fc392be | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Sat Oct 16 09:43:33 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Oct 16 09:43:33 2010 -0700 |
| tree | bf943296099b72879cb6d71c7072d9e39cdafb74 | |
| parent | 8d8034eae023b38581158d3811d34d99f46bea40 [diff] | |
| parent | 82775ae0acf7cac647c057c80fbcc7f13d0554d3 [diff] |
am 82775ae0: resolved conflicts for merge of 347db52a to gingerbread-plus-aosp Merge commit '82775ae0acf7cac647c057c80fbcc7f13d0554d3' * commit '82775ae0acf7cac647c057c80fbcc7f13d0554d3': Update ATOM string routines to latest