Scott Main 82e2b4cb51 am 4fd41688: am 5352d237: 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 '4fd416880e53c172bac4a51b2eafea699b58badf'

* commit '4fd416880e53c172bac4a51b2eafea699b58badf':
  docs: lots of additions to the resources docs

2010-07-15 11:54:15 -07:00

..

config

…

java

am 4fd41688: am 5352d237: 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:54:15 -07:00

jni

am a6be4e01: am 3a053db2: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread

2010-07-15 11:53:51 -07:00

res

Merge "checkpoint tablet status bar"

2010-07-15 11:09:04 -07:00

tests

reduce locking when using SQLiteStatement

2010-07-09 12:31:12 -07:00