tree 8233b79ef0a18576041801bc14dd8d4bcd4e5dc2
parent 47a400131f026fd4afdf09e77fe82e79201c1458
parent cb6dfc2869020f73d95e9951387bc310085bee8d
author Deepanshu Gupta <deepanshu@google.com> 1409795596 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1409795597 +0000

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