tree 1b418689ab5240c1fa4df58e97df2821e4b03966
parent 26582158a4f7dc81293994fec489d721ebcd1e14
parent 10d3c342b04ddcad9c4eb137880ba6ca38471dff
author Scott Main <smain@google.com> 1279217792 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1279217792 -0700

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