Dan Albert 3a091b7997 resolved conflicts for merge of 8e0cfe7c to lmp-mr1-dev-plus-aosp ...

Change-Id: I068d2a0fb118d4e2b4c1e546bebfcbc2cb120d36

2014-11-20 15:41:25 -08:00

..

graphics

resolved conflicts for merge of 8e0cfe7c to lmp-mr1-dev-plus-aosp

2014-11-20 15:41:25 -08:00

opengl

Fix clang warnings in core/jni.

2014-11-20 11:47:00 -08:00