OSDN Git Service

resolve merge conflicts of 5e1d95b0cc05eb1a6bf25a13223601f2e8f8fccb to stage-aosp...
authorNeil Fuller <nfuller@google.com>
Tue, 12 Jun 2018 13:14:13 +0000 (14:14 +0100)
committerNeil Fuller <nfuller@google.com>
Tue, 12 Jun 2018 13:23:51 +0000 (14:23 +0100)
commit79d42a61e4c0832d8ec03da24f342de93341225c
treeec2bcbc1a012ab08c711cd81b40f2d067c8694a9
parentb57dfe26cfb1dc5eae20653d6490464d977c07bc
parent5e1d95b0cc05eb1a6bf25a13223601f2e8f8fccb
resolve merge conflicts of 5e1d95b0cc05eb1a6bf25a13223601f2e8f8fccb to stage-aosp-master

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic5527b29cbe8c84d2053be849cf09df5341e4790
Android.bp
core/java/android/app/SystemServiceRegistry.java
core/java/android/content/Context.java
services/java/com/android/server/SystemServer.java