junyulai 9902b68334 resolve merge conflicts of da290bec0c to stage-aosp-master ...

Bug: None
Test: I solemnly swear I tested this conflict resolution.

Change-Id: I719965f13d1f726fdac5b475fd8733b07e28f5b6
Merged-In: I3d94acb71c142ec38b750e58822881ff383341cc

2019-01-21 12:22:13 +00:00

..

java/com/android/server

resolve merge conflicts of da290bec0c to stage-aosp-master

2019-01-21 12:22:13 +00:00

jni

Fix/suppress services/core google-explicit-constructor warnings

2019-01-02 14:25:32 -08:00

Android.bp

Depend on the stable AIDL version of the netd metrics interface.

2018-12-12 01:03:55 +09:00