Amith Yamasani 4fa32578c1 am 1272442f: am 0abc859e: Merge change 25299 into eclair ...

Merge commit '1272442f1c24cd39b10aa1ef518a80bfcf4c86f2'

* commit '1272442f1c24cd39b10aa1ef518a80bfcf4c86f2':
  Show keyboard automatically in EditTextPreference dialogs

2009-09-17 09:56:43 -07:00

..

config

…

java

am 1272442f: am 0abc859e: Merge change 25299 into eclair

2009-09-17 09:56:43 -07:00

jni

am e8f77e69: am 244f8c26: Fix 2083478: Camera needs an auto-focus cancel API

2009-09-16 23:57:30 -07:00

res

am f324b2b0: am 4f8bb4c8: Merge change 25276 into eclair

2009-09-17 09:56:04 -07:00