am 21915c4c: am 3de1aca2: Merge "Update resources: Colors"

* commit '21915c4cefe17c4325ef46ac05ccee2b8d31009b':
This commit is contained in:
Satoshi Kataoka 2013-09-26 06:07:48 -07:00 committed by Android Git Automerger
commit 1cec6243f9

Diff content is not available