vichang ba3ebf0844 Merge "Remove the duplicated constant declaration in DateUtilsBridge" am: 3db0441e5c am: c52a84acf3 am: 70862e266e ...

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

Change-Id: I6b721c9fbac71bdc75ce2682f06d67f8916e25a9

2020-07-21 09:53:28 +00:00

..

java

Merge "Remove the duplicated constant declaration in DateUtilsBridge" am: 3db0441e5c am: c52a84acf3 am: 70862e266e

2020-07-21 09:53:28 +00:00

jni

Merge "Zygote: Add Arm pointer authentication keychange support." am: 285dfb3126 am: 9b63f4e904

2020-07-17 18:16:08 +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 "Remove the duplicated constant declaration in DateUtilsBridge" am: 3db0441e5c am: c52a84acf3 am: 70862e266e

2020-07-21 09:53:28 +00:00

xsd

Merge "Convert core/xsd/vts/Android.mk file to Android.bp" am: 682de55962 am: 6fc5f5e76e

2020-05-19 22:04:40 +00:00

TEST_MAPPING

…