Scott Main 5352d2378d am 38137d7a: Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo ...

Merge commit '38137d7a27b037611c70a9d900aa53b4c15563bf' into gingerbread

* commit '38137d7a27b037611c70a9d900aa53b4c15563bf':
  docs: lots of additions to the resources docs

2010-07-15 11:20:32 -07:00

..

java

am 38137d7a: Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo

2010-07-15 11:20:32 -07:00

jni

don't hardcode "mSurface" throughout our source code

2010-04-12 16:29:36 -07:00

tests/graphicstests

More framework tests cleanup.

2010-04-01 18:31:11 -07:00