Skip to content
Commit 19fa86cf authored by Deepanshu Gupta's avatar Deepanshu Gupta Committed by Android Git Automerger
Browse files

am 5384d40e: (-s ours) am b79bb54e: am f4ba8731: am 338e32ba: (-s ours) am... 

am 5384d40e: (-s ours) 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 '5384d40e':
  Resolve color xml attributes properly. [DO NOT MERGE]
parents 409e42a1 5384d40e
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment