tree 2545703fa0b4fb251cb4dc22aed99a59ca5cfd80
parent 02b77f81cfcb7c0105ecc012bcc791f0e2c02e6a
parent 3b3e368c73f4224b055635e6e79f57cc702d8938
author Scott Main <smain@google.com> 1279670092 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279670092 -0700

am 3b3e368c: am 60a20061: am 2316d626: docs: add information about using color resources as drawables

Merge commit '3b3e368c73f4224b055635e6e79f57cc702d8938'

* commit '3b3e368c73f4224b055635e6e79f57cc702d8938':
  docs: add information about using color resources as drawables