Doug Zongker 33ce433ac2 am a973eaea: am b5b67779: Merge change I7fa8c508 into eclair-mr2 ...

Merge commit 'a973eaea4597d819671c5caab8feed442e9a1af5'

* commit 'a973eaea4597d819671c5caab8feed442e9a1af5':
  make erase-password-on-SIM-change optional

2009-10-13 17:11:12 -07:00

..

config

…

java

am a973eaea: am b5b67779: Merge change I7fa8c508 into eclair-mr2

2009-10-13 17:11:12 -07:00

jni

am 360f21cd: am a4adc798: Merge change I409d9b4a into eclair-mr2

2009-10-13 16:59:28 -07:00

res

am 5a6d521d: am 656c037c: Fix the youtube placeholder.

2009-10-13 16:59:49 -07:00