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

* commit '9dec9e9d65c9f70b7a45fb3ad8f3f752b7b35fdf':
  Avoid overwriting EGL14.EGL_NO_SURFACE

2014-12-02 00:48:33 +00:00

..

java

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

2014-12-01 23:45:07 +00:00

jni

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

2014-12-02 00:48:33 +00:00

res

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

2014-12-01 19:32:12 +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