Andreas Gampe 7d13d9db1e resolved conflicts for merge of 3fc5e3ca to lmp-mr1-dev-plus-aosp ...

Change-Id: Id8286e5a4381315a6060251a8055b0f1d1a96019

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

..

graphics

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

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

opengl

Frameworks/base: Consistency in core/jni

2014-11-21 10:15:08 -08:00