tree 7a33febbd2ef5337940920352817f1bc9fcd9726
parent 0ff5117fb3aebfd64ffe26ff68308632c7ceeb3d
parent 4df075bcb5770ba411b6a32c9daeac24da0597e2
author Deepanshu Gupta <deepanshu@google.com> 1409853587 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409853587 +0000

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 jb-dev

* commit '4df075bcb5770ba411b6a32c9daeac24da0597e2':
  Resolve color xml attributes properly. [DO NOT MERGE]