| commit | 889ec19249fecfa7121c77b4c2bb32a054311cb5 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Thu Sep 04 18:10:39 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 04 18:10:39 2014 +0000 |
| tree | 97c139d55b580f53c54dd079594bc6bc16c8a7b9 | |
| parent | 9f7c594a05411191d83ccb21655fbd8d52f56189 [diff] | |
| parent | a7ce11070a74f7a0447f0d40d51cb0d3f95999fd [diff] |
am a7ce1107: am 19fa86cf: am 5384d40e: (-s ours) am b79bb54e: am f4ba8731: am 338e32ba: (-s ours) am 6c1bf6b1: am 2db4037c: am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev * commit 'a7ce11070a74f7a0447f0d40d51cb0d3f95999fd': Resolve color xml attributes properly. [DO NOT MERGE]