Ajay Panicker a42f058908 Merge "Synchronize on a static final object to lock mDeviceBusy" am: 34f9a3e9e9 am: 56d37b7c43 ...

am: 9020cf9a48

Change-Id: Ia12ca64ff5acca55182bac2fb8bae2523c7fc06a

2018-10-18 23:44:18 -07:00

..

java

Merge "Synchronize on a static final object to lock mDeviceBusy" am: 34f9a3e9e9 am: 56d37b7c43

2018-10-18 23:44:18 -07:00

jni

Merge "Update to EGL 1.5"

2018-10-18 23:33:45 +00:00

proto

[GraphicsEnvironment] Add whitelist support.

2018-10-16 12:54:38 -07:00

res

resolve merge conflicts of aad998c0b4 to pi-dev-plus-aosp

2018-10-18 13:44:22 +00:00

tests

Merge "Revive ForwardDeleteTest with updating expectations"

2018-10-18 20:01:34 +00:00