Steve Elliott ad14c752c4 Merge "Always use Shortcut Icon in conversation if available" into rvc-dev am: cc1937581a am: 4c42f40c1f ...

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

Change-Id: Ifcdbc8f129e1f7463e98a190e0dc1d66b95980e4

2020-06-02 18:53:32 +00:00

..

java

Merge "Always use Shortcut Icon in conversation if available" into rvc-dev am: cc1937581a

2020-06-02 18:52:21 +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

…