OSDN Git Service

Merge commit 'ce073d70bedc' into stage-aosp-master
authorNathan Harold <nharold@google.com>
Wed, 29 Mar 2017 23:56:06 +0000 (23:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 29 Mar 2017 23:56:06 +0000 (23:56 +0000)
commite45e328821badf42dc98c0b37326c73400eef651
tree5c1e95b2cca470f8223d8dadaf80002e43eeed81
parentdfc1264eff5d268fde41c44db7081942ba44ebb7
parent4fdc7d5ddd05658deec383790f63477df355f3fb
Merge commit 'ce073d70bedc' into stage-aosp-master
am: 4fdc7d5ddd

Change-Id: I4bde8eedc986900096fc8429da2b195f907605c9
services/java/com/android/server/SystemServer.java