Yan Yan df0053fc49 Merge changes from topic "new-ipsec-api" am: a80fb3bbe6 am: cb5aed6518 am: 4cddef19b1 ...

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

Change-Id: I2f7b92f59747df7a78ce72ff5df26d486907be56

2020-10-16 23:24:13 +00:00

..

assets

…

res

Merge changes from topic "new-ipsec-api" am: a80fb3bbe6 am: cb5aed6518 am: 4cddef19b1

2020-10-16 23:24:13 +00:00

Android.bp

Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)

2020-08-31 21:21:38 -07:00

AndroidManifest.xml

Merge "Add READ_PRIVILEGED_PHONE_STATE to TestApi" am: d70fa41860 am: 8c9d627fa3 am: 70c45b45b4

2020-10-12 23:07:31 +00:00

lint.xml

…

MakeJavaSymbols.sed

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

TEST_MAPPING

…