Alan Viverette 47379f3050 am e442e904: am 47172f53: Merge "Use parseColor instead of getHTMLColor" ...

* commit 'e442e904ae19f0b59ebfd4a7c735648b64bc955e':
  Use parseColor instead of getHTMLColor

2014-11-21 20:49:04 +00:00

..

java

am e442e904: am 47172f53: Merge "Use parseColor instead of getHTMLColor"

2014-11-21 20:49:04 +00:00

jni

resolved conflicts for merge of 3fc5e3ca to lmp-mr1-dev-plus-aosp

2014-11-21 10:36:14 -08:00

res

am deee5566: am d45cedd6: Merge "Make default windows features configurable." into lmp-mr1-dev

2014-11-21 19:27:55 +00:00

tests

am 1d76d397: Merge "Fix wifi reconnection tests." into lmp-mr1-dev

2014-11-21 02:43:06 +00:00