Michael Wright ed06122ee7 Merge "Avoid NPE when getting last shutdown reason." into oc-dev ...

am: 0cf6b908a8

Change-Id: Ib31807bddc953d2bba068359c9468257d1b92a9f

2017-05-11 16:04:53 +00:00

..

java/com/android/server

Merge "Avoid NPE when getting last shutdown reason." into oc-dev

2017-05-11 16:04:53 +00:00

jni

Merge "Add uniqueId to Virtual Display and pass through to inputflinger (1/2)" into oc-dev

2017-05-11 03:55:40 +00:00

Android.mk

Remove dependency on telephony-common from services/core

2017-05-05 18:11:11 -07:00