| commit | 7f26655a5bcaa8a6273ed603a465090d0e434d07 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Thu Sep 04 06:26:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 04 06:26:25 2014 +0000 |
| tree | 8a43478a358ad339f049a1a1a217b9ffcd0a482f | |
| parent | 84268142a64d463453556588bd4f7092af31fae9 [diff] | |
| parent | a4d978668219572b71538dc98dab461fe99dfcc3 [diff] |
am a4d97866: am 2d70a5a9: am 06a31255: am 3f1cc48a: (-s ours) am ae6a52eb: am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev * commit 'a4d978668219572b71538dc98dab461fe99dfcc3': Resolve color xml attributes properly. [DO NOT MERGE]