| commit | 47379f3050265453655ff82edd4c36bda01ba48f | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Fri Nov 21 20:49:04 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 21 20:49:04 2014 +0000 |
| tree | 653ff1e9839ca9da2a9fccb325c22f20beb5c38c | |
| parent | 296ea9174222e64085a66a238e6df13b8b378b1e [diff] | |
| parent | e442e904ae19f0b59ebfd4a7c735648b64bc955e [diff] |
am e442e904: am 47172f53: Merge "Use parseColor instead of getHTMLColor" * commit 'e442e904ae19f0b59ebfd4a7c735648b64bc955e': Use parseColor instead of getHTMLColor