commit | 48349ea91823112e3fd2d431116027aed743b1a4 | [log] [tgz] |
---|---|---|
author | Deepanshu Gupta <deepanshu@google.com> | Thu Sep 04 05:22:43 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 04 05:22:43 2014 +0000 |
tree | 079a11e6d677b4dd47c8b95b1e7e9c1ab614374d | |
parent | 8bc68f964801f3dcb36a76628cd3d289f3f279ca [diff] | |
parent | 66224e2524e9b6723c783f14598c2e02118ea7f5 [diff] |
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 '66224e2524e9b6723c783f14598c2e02118ea7f5': Resolve color xml attributes properly. [DO NOT MERGE]