tree 1c9e396809324b2dc90a6288bb02dfdf2ea82adf
parent 0d5a7d7f41c0c7bd920fda0e7d4780dc639c90f1
parent 9bfa073662748e2d0b4b08cfa7fa312e7023f75c
author Deepanshu Gupta <deepanshu@google.com> 1409854662 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409854662 +0000

am 9bfa0736: am 7119fbb6: am 4df075bc: am 057eb404: (-s ours) am a5176670: am 033a54ec: am c33fc8de: (-s ours) am 48349ea9: am 66224e25: am 12bbbb2b: am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into

* commit '9bfa073662748e2d0b4b08cfa7fa312e7023f75c':
  Resolve color xml attributes properly. [DO NOT MERGE]