tree dd16beeacf6b4659b7374b0a4defc9809b6171c2
parent e19464aae4ba251c758f3b27601ef3470e0a8c2d
parent b79bb54e92b03bc032a91084f8a5ab7246136d9f
author Deepanshu Gupta <deepanshu@google.com> 1409852001 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409852001 +0000

am b79bb54e: am f4ba8731: am 338e32ba: (-s ours) am 6c1bf6b1: am 2db4037c: am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev

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