Jorim Jaggi 5534e159c1 Merge "Fix overlapping remote and recents animations" into qt-r1-dev am: b248a0343f am: dd40a0c75a ...

am: c7b3ff1c52

Change-Id: Iaba42814773ab7333aae3fbc90d3bbd2ea8bac87

2019-08-05 12:01:12 -07:00

..

java/com/android/server

Merge "Fix overlapping remote and recents animations" into qt-r1-dev am: b248a0343f am: dd40a0c75a

2019-08-05 12:01:12 -07:00

jni

Merge "Revert "Revert "Use std::set instead of SortedVector"""

2019-07-23 23:22:24 +00:00

xsd

Merge "Add a platform compat config schema API."

2019-07-25 08:57:16 -07:00

Android.bp

resolve merge conflicts of 56509ddb84 to stage-aosp-master

2019-07-29 15:21:58 +01:00