Bjorn Bringert da157b94df am deb83f99: am 159f0015: Merge change I98819b18 into eclair-mr2 ...

Merge commit 'deb83f9944bb08d1d042330d9f8969f3f6124f3b'

* commit 'deb83f9944bb08d1d042330d9f8969f3f6124f3b':
  Allow resource and file URIs in ImageView.setImageURI()

2009-12-10 14:40:09 -08:00

..

config

…

java

am deb83f99: am 159f0015: Merge change I98819b18 into eclair-mr2

2009-12-10 14:40:09 -08:00

jni

am 68a3b8b6: am 24eca800: Merge change I887f355f into eclair-mr2

2009-12-10 07:05:18 -08:00

res

use a fixed value for public ID

2009-12-10 11:14:41 -08:00