Merge commit '8cae124af2142687a6833dbaab8a43df6dd67b43' into eclair-plus-aosp * commit '8cae124af2142687a6833dbaab8a43df6dd67b43': Various cleanup around resources and nine-patches.
Merge commit '8cae124af2142687a6833dbaab8a43df6dd67b43' into eclair-plus-aosp * commit '8cae124af2142687a6833dbaab8a43df6dd67b43': Various cleanup around resources and nine-patches.