Tri Vo 59a79fcc0a Merge "Replace libsuspend with android.system.suspend@1.0" ...

am: ea6b8117c9

Change-Id: I489c98b374f8e5939e4c05499acd1b93d30a1f3f

2018-09-28 19:18:07 -07:00

..

java/com/android/server

resolve merge conflicts of ee5fc8831e to stage-aosp-master

2018-09-27 16:28:57 +01:00

jni

Replace libsuspend with android.system.suspend@1.0

2018-09-28 10:41:12 -07:00

Android.bp

services.core.unboosted: hidl manager->static_libs

2018-06-26 16:07:22 +00:00