Chris Craik 97b4ccbd97 Merge "Expose color filter mutate methods"

2017-03-17 00:32:21 +00:00

..

java

Merge "Add a compat hack into SurfaceView#setWindowType()"

2017-03-16 23:54:23 +00:00

jni

Merge "Expose color filter mutate methods"

2017-03-17 00:32:21 +00:00

proto/android

CEC: Revisit the behavior of HDMI_SYSTEM_AUDIO_ENABLED

2017-03-13 20:00:58 +09:00

res

Merge "Add a flag that indicates whether in-band ringing is avalable" am: 41f5b61f5d am: 592d78238d

2017-03-17 00:21:31 +00:00

tests

Merge "frameworks/base: Add APCT tests to the device-tests suite."

2017-03-16 17:35:12 +00:00