Dianne Hackborn 648297ff5d am 7c47adef: Merge change 26527 into eclair ...

Merge commit '7c47adefea3101876f747926e7631406b4fbf45e' into eclair-plus-aosp

* commit '7c47adefea3101876f747926e7631406b4fbf45e':
  Dock screen on config can now select AC or USB.

2009-09-22 19:31:58 -07:00

..

config

…

java

am 520ca7e5: Merge change 26415 into eclair

2009-09-22 19:12:52 -07:00

jni

Unhide Camera lock and unlock API.

2009-09-21 07:28:44 +08:00

res

Merge change 26527 into eclair

2009-09-22 22:24:10 -04:00