Fred Quintana 664614cfa5 am 765f49e2: am 34b6a27e: Merge change 23375 into eclair ...

Merge commit '765f49e22d7dbf608710baa95e9769b9133d9483'

* commit '765f49e22d7dbf608710baa95e9769b9133d9483':
  re-enable cancelation of the sync thread upon receipt of ISyncAdapter.cancelSync()

2009-08-31 18:55:36 -07:00

..

config

…

java

am 765f49e2: am 34b6a27e: Merge change 23375 into eclair

2009-08-31 18:55:36 -07:00

jni

Merge change 23380 into eclair

2009-08-31 17:45:03 -07:00

res

Fix http://b/issue?id=2086835 (unlock pattern graphics misaligned).

2009-08-31 11:07:49 -04:00