OSDN Git Service

Merge commit 'ce073d70bedc' into stage-aosp-master
authorNathan Harold <nharold@google.com>
Wed, 29 Mar 2017 23:03:34 +0000 (16:03 -0700)
committerNathan Harold <nharold@google.com>
Wed, 29 Mar 2017 23:04:31 +0000 (16:04 -0700)
commit4fdc7d5ddd05658deec383790f63477df355f3fb
treef9a92c96b6f9d77f04e424e338417c6fddc71dde
parent25105f65617d4afd2b0059a0520026eeb95f7744
parentce073d70bedc47876da1644fca59864c669d34af
Merge commit 'ce073d70bedc' into stage-aosp-master

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