Todd Kennedy 8c18322a58 Merge "null check before dereference" into oc-dev am: df8569787c ...

am: 6939301147

Change-Id: I9867cce02601d139893edef2c2cc6f89da1d74a9

2017-06-26 17:18:43 +00:00

..

java/com/android/server

Merge "null check before dereference" into oc-dev am: df8569787c

2017-06-26 17:18:43 +00:00

jni

Make the log message in setInteractive a local variable.

2017-06-21 15:21:18 +00:00

Android.mk

Merge "Only enable wide color gamut support on capable devices" into oc-dr1-dev

2017-06-20 23:53:14 +00:00