| commit | a4d978668219572b71538dc98dab461fe99dfcc3 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Thu Sep 04 06:16:36 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 04 06:16:36 2014 +0000 |
| tree | 0367d4be392d136501f8742162c5fcbeb0cae247 | |
| parent | ccd53eecb946ad8d08fb332f0159db4816e62604 [diff] | |
| parent | 2d70a5a9d1556f269b8ed79b1f6a896ce8241b51 [diff] |
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 '2d70a5a9d1556f269b8ed79b1f6a896ce8241b51': Resolve color xml attributes properly. [DO NOT MERGE]