OSDN Git Service

Merge commit 'e45e328821ba' into oc-dev-plus-aosp
authorNathan Harold <nharold@google.com>
Thu, 30 Mar 2017 00:05:10 +0000 (17:05 -0700)
committerNathan Harold <nharold@google.com>
Thu, 30 Mar 2017 00:05:10 +0000 (17:05 -0700)
commit560c9ec724bdebc31a35a934a703cd802e0926f4
tree0e56b2a11ee369939f5bc89f384311680b10dd87
parentfb0ad3705dd83c172cd6915a3e2d0a5df3ef1870
parente45e328821badf42dc98c0b37326c73400eef651
Merge commit 'e45e328821ba' into oc-dev-plus-aosp

Change-Id: I30ad9038be8faee57e5d6b1391d9e70a966a9a77
Android.mk
core/java/android/app/SystemServiceRegistry.java
services/java/com/android/server/SystemServer.java