| commit | 9bfa073662748e2d0b4b08cfa7fa312e7023f75c | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Thu Sep 04 18:10:53 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 04 18:10:53 2014 +0000 |
| tree | 97c139d55b580f53c54dd079594bc6bc16c8a7b9 | |
| parent | 8929642ca72981f3c5cd4e7d408d47c724d9127b [diff] | |
| parent | 7119fbb63a32f4f51bf07293c0a7f5a3a32abba0 [diff] |
am 7119fbb6: am 4df075bc: 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 '7119fbb63a32f4f51bf07293c0a7f5a3a32abba0': Resolve color xml attributes properly. [DO NOT MERGE]