Jesse Hall c46ac588e3 am 954b325b: am 9dec9e9d: am 1ee37776: Merge "Avoid overwriting EGL14.EGL_NO_SURFACE" ...

* commit '954b325bc3e30a08f41117d85aea4b7f802401f4':
  Avoid overwriting EGL14.EGL_NO_SURFACE

2014-12-02 01:25:27 +00:00

..

java

am 96af2bd7: am 1d22f99d: am f1702487: CEC: make it sure to send vendor commands when changing a setting.

2014-12-01 23:51:38 +00:00

jni

am 954b325b: am 9dec9e9d: am 1ee37776: Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"

2014-12-02 01:25:27 +00:00

res

am 53651b99: am ff45e7df: am 1d184ace: resolved conflicts for merge of 7377998d to lmp-mr1-dev

2014-12-01 19:37:59 +00:00

tests

am 05d455ca: am b9ccc047: Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev

2014-12-01 20:00:32 +00:00