Adrian Roos 4f8b633dda Merge "IME: Add IME owners to View(RootImpl)" am: aa8d926fbb am: f98a40b6f3 am: 7304f79c51 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id4873ce6ba1a9e1c0f4daebf266707b0f0c0c5ff

2020-12-16 17:54:03 +00:00

..

api

Merge "Hide ContentInfo.partition from the public API"

2020-12-16 17:41:41 +00:00

java

Merge "IME: Add IME owners to View(RootImpl)" am: aa8d926fbb am: f98a40b6f3 am: 7304f79c51

2020-12-16 17:54:03 +00:00

jni

Revert^2 "libandroidfw hardening for IncFs" am: 80094e39f9 am: ab46005fe8

2020-12-14 22:25:02 +00:00

proto

Rename "Foreground Job" & "HPJ" to "Expedited job".

2020-12-15 11:54:31 -08:00

res

Merge "Import translations. DO NOT MERGE ANYWHERE"

2020-12-16 16:05:34 +00:00

sysprop

…

tests

Merge "Add System APIs for TimeZoneProvider"

2020-12-16 13:21:54 +00:00

xsd

…

TEST_MAPPING

…