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

am 057eb404: (-s ours) am a5176670: am 033a54ec: am c33fc8de: (-s ours) am... 

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 '057eb404':
  Resolve color xml attributes properly. [DO NOT MERGE]
parents 7055778e 057eb404
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