The Android Open Source Project 63ae85f0e1 am 42ef77f3: merge from open-source master ...

Merge commit '42ef77f3603ae54990d6718db79afae61e91dc61'

* commit '42ef77f3603ae54990d6718db79afae61e91dc61':
  Shoud specify the Resource class instance as an argument of the method

2010-07-21 08:15:45 -07:00

..

config

…

java

am 42ef77f3: merge from open-source master

2010-07-21 08:15:45 -07:00

jni

Merge "Add preliminary support for text rendering."

2010-07-20 16:43:31 -07:00

res

…

tests

…