commit | 057eb404363184b75ab0e5d3768a22126703f750 | [log] [tgz] |
---|---|---|
author | Deepanshu Gupta <deepanshu@google.com> | Thu Sep 04 17:33:28 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 04 17:33:28 2014 +0000 |
tree | dd16beeacf6b4659b7374b0a4defc9809b6171c2 | |
parent | a9f56d5a050845703bdcfff734d9d189bec2ddec [diff] | |
parent | a5176670c8ef21b42e0a2e7db07c968e3ceacb39 [diff] |
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 'a5176670c8ef21b42e0a2e7db07c968e3ceacb39': Resolve color xml attributes properly. [DO NOT MERGE]