| commit | 80bf12f74a2dc0bf0d5638cb1b0dec70731edcdc | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Fri Nov 21 23:13:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 21 23:13:03 2014 +0000 |
| tree | 933323af7ab4048156195960690df06ab1775a50 | |
| parent | 2388c814a02f8b714ee755679b90d716a106e921 [diff] | |
| parent | 47379f3050265453655ff82edd4c36bda01ba48f [diff] |
am 47379f30: am e442e904: am 47172f53: Merge "Use parseColor instead of getHTMLColor" * commit '47379f3050265453655ff82edd4c36bda01ba48f': Use parseColor instead of getHTMLColor