| commit | cd31f76067d2fa3a40365ead10794d66ee0ac0b6 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Thu Sep 04 04:45:13 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 04 04:45:13 2014 +0000 |
| tree | 048b9972feba196f12bee04f2ffdb5bfbd9f88d5 | |
| parent | aa52a6c33e1382108a5312318b3f7af2464cdc6e [diff] | |
| parent | 4a4683c72a649b6435e872b71936a68dd97fe408 [diff] |
am 4a4683c7: (-s ours) am a92f199d: am 0ddd915f: am 509e5db1: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-dev * commit '4a4683c72a649b6435e872b71936a68dd97fe408': Resolve color xml attributes properly. [DO NOT MERGE]