Jayachandran Chinnakkannu f84d14e54a Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs" am: 1dc2a0d77b am: 7798357a86 ...

am: 6906046fa3

Change-Id: If229255c7cc7af4ca1e8de7c6a2e493b3d6aafc3

2019-11-18 14:07:08 -08:00

..

java

Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs" am: 1dc2a0d77b am: 7798357a86

2019-11-18 14:07:08 -08:00

jni

Merge "vibrator: reflect CAP_EXTERNAL_AMPLITUDE_CONTROL" am: fb95396170 am: bc3515792e

2019-11-07 12:01:06 -08:00

xsd

…

Android.bp

resolve merge conflicts of 8e8c40b5c2 to master

2019-11-13 17:21:20 +00:00