Remi NGUYEN VAN bc3c6b1314 Merge changes I0f997d30,I288ba1f4 ...

am: 53f8591789

Change-Id: I8309074ba0744dee5789a2fe1f3b7e20bb3bc5b9

2018-09-30 19:53:29 -07:00

..

java

Merge changes I0f997d30,I288ba1f4

2018-09-30 19:53:29 -07:00

jni

Merge "Don't check qtaguid file unless using them"

2018-09-28 12:15:54 -07:00

proto

WM: Add debug information for forced seamless rotation

2018-07-09 14:24:19 -07:00

res

resolve merge conflicts of ee5fc8831e to stage-aosp-master

2018-09-27 16:28:57 +01:00

tests

Merge "Add feature flag in Settings."

2018-09-17 07:09:28 -07:00