Jing Ji 052a6995f3 Merge "Java docs update: Advise not to include PII in setProcessStateSummary" into rvc-dev am: fcaa94e2dc am: 62b56170ac ...

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

Change-Id: Ib863b0d82fafa240177a78235c653ae35d1a19d4

2020-07-23 22:19:54 +00:00

..

java

Merge "Java docs update: Advise not to include PII in setProcessStateSummary" into rvc-dev am: fcaa94e2dc am: 62b56170ac

2020-07-23 22:19:54 +00:00

jni

Merge changes from topic "runtime_skipcache" am: af04506edd am: 8ac7d59373

2020-07-22 20:39:52 +00:00

proto

[DO NOT MERGE] Rollup changes from R related to CertInstaller and KeyChain

2020-07-15 15:50:14 +01:00

res

Import translations. DO NOT MERGE ANYWHERE

2020-07-18 20:03:58 -07:00

tests

Merge "Update graphics language to comply with Android’s inclusive language guidance" am: da4dc882af am: a97e560c61 am: 53ee2070ed

2020-07-23 14:12:14 +00:00

xsd

…

TEST_MAPPING

…