Nicolas Roard e491af9c34 am a57f8297: am 194099dc: Merge change 26220 into eclair ...

Merge commit 'a57f82975eeb0a7dfa7d0fd310ae9612857a6c31'

* commit 'a57f82975eeb0a7dfa7d0fd310ae9612857a6c31':
  Reimplement the settings to use async callbacks

2009-09-22 11:16:37 -07:00

..

config

…

java

am a57f8297: am 194099dc: Merge change 26220 into eclair

2009-09-22 11:16:37 -07:00

jni

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

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

res

am 1df98859: am b5c29399: Merge change 26301 into eclair

2009-09-22 10:09:35 -07:00