Dianne Hackborn 5d2b52adb8 am 648297ff: am 7c47adef: Merge change 26527 into eclair ...

Merge commit '648297ff5d1a56f08985d26d58f1471e2ff0ba86'

* commit '648297ff5d1a56f08985d26d58f1471e2ff0ba86':
  Dock screen on config can now select AC or USB.

2009-09-25 08:46:37 -07:00

..

config

…

java

am 2b0d6e7e: am 520ca7e5: Merge change 26415 into eclair

2009-09-25 08:46:23 -07:00

jni

am cd3a0242: am ffe1cf25: Unhide Camera lock and unlock API.

2009-09-20 17:18:03 -07:00

res

am 648297ff: am 7c47adef: Merge change 26527 into eclair

2009-09-25 08:46:37 -07:00