| commit | b16659533e55476bbe2c0b177943ef8f4129e34a | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@android.com> | Mon Dec 07 08:09:53 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 07 08:09:53 2009 -0800 |
| tree | 8572341da27537bc6bacf8486841b95a41fc34a6 | |
| parent | fe8ab167caa0fb93d068a6f93932f9ce3115c327 [diff] | |
| parent | 623a5572e894c2114767f5631165354076d0b139 [diff] |
am 623a5572: resolved conflicts for merge of 882ad42e to eclair-mr2 Merge commit '623a5572e894c2114767f5631165354076d0b139' into eclair-mr2-plus-aosp * commit '623a5572e894c2114767f5631165354076d0b139': Add clean step for switching GPS API from pdapi to loc_api