Rob Carr e2d843987f Merge "SurfaceView: Lock mDeferredDestroySurfaceControl" into rvc-dev am: 28fdf609dc am: 9f6a76be41 ...

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11688831

Change-Id: I8dde82dd2640bb2d36fb9f6e04cee1b978631229

2020-06-02 19:41:21 +00:00

..

java

Merge "SurfaceView: Lock mDeferredDestroySurfaceControl" into rvc-dev am: 28fdf609dc

2020-06-02 19:29:00 +00:00

jni

Merge "Delete local reference in android_media_AudioEffectDescriptor." into rvc-dev

2020-06-02 17:35:05 +00:00

proto

Merge "Add Setting for NR screen off indications" into rvc-dev

2020-05-26 21:56:42 +00:00

res

Import translations. DO NOT MERGE

2020-06-01 20:22:41 +00:00

tests

Merge "Fix get display from display context derived context not working" into rvc-dev am: 13e3568567

2020-05-30 06:51:42 +00:00

xsd

…

TEST_MAPPING

…