| commit | 4df075bcb5770ba411b6a32c9daeac24da0597e2 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Thu Sep 04 17:46:19 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 04 17:46:19 2014 +0000 |
| tree | 8233b79ef0a18576041801bc14dd8d4bcd4e5dc2 | |
| parent | 7055778ef5e97f6f83181a44c9b3804632f6f64e [diff] | |
| parent | 057eb404363184b75ab0e5d3768a22126703f750 [diff] |
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 '057eb404363184b75ab0e5d3768a22126703f750': Resolve color xml attributes properly. [DO NOT MERGE]