vichang f5ed148053 Merge changes from topic "DateUtilsBridge" am: 59d12aa8bd am: f65666d055 ...

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

Change-Id: Idd5d71f2d6b787ddbece60746c97dd2713ecc7cc

2020-07-13 10:22:38 +00:00

..

java

Merge changes from topic "DateUtilsBridge" am: 59d12aa8bd am: f65666d055

2020-07-13 10:22:38 +00:00

jni

Merge "HwBinder.setTrebleTestingOverride" am: 3804ae082c am: 8b6e909cbf

2020-07-09 17:19:18 +00:00

proto

Merge "Add Setting for NR screen off indications"

2020-06-23 17:39:41 +00:00

res

Import translations. DO NOT MERGE

2020-07-11 07:34:31 -07:00

tests

Merge changes from topic "DateUtilsBridge" am: 59d12aa8bd am: f65666d055

2020-07-13 10:22:38 +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

…