Jim Miller c721389c45 am b0396681: resolved conflicts for merge of ee3fd99a to eclair-mr2-plus-aosp ...

Merge commit 'b03966815581c367269f10dd2c832e8c4414c68d'

* commit 'b03966815581c367269f10dd2c832e8c4414c68d':
  Fix 2268841: Much better looking layout for pattern lock screen.

2009-11-18 00:46:52 -08:00

..

config

donut snapshot

2009-05-20 11:28:04 -07:00

java

am 1f60ff34: am e45ebbaf: am 04a0e969: Merge change Id7c432bf into eclair

2009-11-17 18:11:48 -08:00

jni

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

2009-11-06 10:28:34 -08:00

res

am b0396681: resolved conflicts for merge of ee3fd99a to eclair-mr2-plus-aosp

2009-11-18 00:46:52 -08:00