tree 85480a6878ff45ef27df5c3611f5d50af6a68dcd
parent 6a9c6c6baedb994a619573388056c95475f84abf
parent 095cdf85d1aef235cc83db1bec62207f8ab7d1fe
author Deepanshu Gupta <deepanshu@google.com> 1409795628 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1409795629 +0000

Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev