Ken Shirriff 3b8ee3568a am 300160ed: Merge change I29a3be5b into eclair-mr2 ...

Merge commit '300160edc936f2b8265900101136068e3912ff33' into eclair-mr2-plus-aosp

* commit '300160edc936f2b8265900101136068e3912ff33':
  Calendar: add CALLER_IS_SYNCADAPTER parameter.

2009-11-06 11:35:42 -08:00

..

config

…

java

am 300160ed: Merge change I29a3be5b into eclair-mr2

2009-11-06 11:35:42 -08:00

jni

am 8b1243e5: jni: GpsLocationProvider: Check for pending callbacks before waiting

2009-11-06 06:31:37 -08:00

res

am 13bf8260: Fix SDK build: a few things missing, a link that was wrong.

2009-11-05 21:57:51 -08:00