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

* commit '1cec6243f937fc9865c898940c15ed4401c5af1a':
main
Satoshi Kataoka 2013-09-26 08:20:26 -07:00 committed by Android Git Automerger
commit 77fc91b22c

Diff Content Not Available