Yan Yan 980efc2be1 Merge "Support converting IkeTrafficSelector to/from PersistableBundle" am: 6a6a6349a7 am: 029885f8c7 am: 768da4ffc0 am: d033e4ff51 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iffc0cb95dedc546e6f28ffc6a2cb096cb87cfd27

2021-03-02 01:08:58 +00:00

..

api

Merge "AudioTrack: Add TunerConfiguration.CONTENT_ID_NONE" into sc-dev am: 1123c38bec

2021-03-02 01:08:34 +00:00

java

Merge "Support converting IkeTrafficSelector to/from PersistableBundle" am: 6a6a6349a7 am: 029885f8c7 am: 768da4ffc0 am: d033e4ff51

2021-03-02 01:08:58 +00:00

jni

Merge "AudioRecord: Add setLogSessionId" into sc-dev am: 77beac00ba

2021-03-01 23:20:46 +00:00

proto

Merge "Allow non-resizable apps in split-screen (5/n)" into sc-dev

2021-03-01 22:33:24 +00:00

res

Merge "Revert "Avoid IME restart for configChanges"" into sc-dev am: b2e45a2dc6

2021-03-01 18:45:38 +00:00

sysprop

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

2021-02-21 20:12:24 +00:00

tests

Merge "Shortcut integration with AppSearch (Part 2)" into sc-dev am: 4a08dabf99

2021-03-01 23:21:41 +00:00

xsd

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

2021-02-21 20:12:24 +00:00

TEST_MAPPING

…