| commit | 338e32ba521df8cbd295e69d8f20626452baa4a5 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Thu Sep 04 04:32:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 04 04:32:46 2014 +0000 |
| tree | aa0a95225a2ba17615c08660b9c41ede1f76aa16 | |
| parent | a82db08e1d5f2c7b1751a93bc10d0fc5d231f9e4 [diff] | |
| parent | 6c1bf6b161cf3c18b49831eba71811d3fa00d108 [diff] |
am 6c1bf6b1: am 2db4037c: am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev * commit '6c1bf6b161cf3c18b49831eba71811d3fa00d108': Resolve color xml attributes properly. [DO NOT MERGE]