| commit | e442e904ae19f0b59ebfd4a7c735648b64bc955e | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Fri Nov 21 20:45:09 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 21 20:45:09 2014 +0000 |
| tree | 36e560fd7bfacb198b76fa70e5faa412495929ae | |
| parent | 3fc5e3cabfd9787e722b7720eabbcbba49984a94 [diff] | |
| parent | 47172f53659e4e98988dab99a4155653b638b1e5 [diff] |
am 47172f53: Merge "Use parseColor instead of getHTMLColor" * commit '47172f53659e4e98988dab99a4155653b638b1e5': Use parseColor instead of getHTMLColor