| commit | a5176670c8ef21b42e0a2e7db07c968e3ceacb39 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Thu Sep 04 17:22:13 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 04 17:22:13 2014 +0000 |
| tree | 14b715de9587f5ba917dc29747f0adc225715e82 | |
| parent | 44db2b3ef65ff2b0aa340018a6db93cdd52caa60 [diff] | |
| parent | 033a54ec746bd8a4c5913f8290deb4a4ec653c50 [diff] |
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 '033a54ec746bd8a4c5913f8290deb4a4ec653c50': Resolve color xml attributes properly. [DO NOT MERGE]