OSDN Git Service

Merge "Remove redundant TextClassificationService" into oc-dev am: 104590844e
authorAbodunrinwa Toki <toki@google.com>
Tue, 9 May 2017 17:26:01 +0000 (17:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 9 May 2017 17:26:01 +0000 (17:26 +0000)
commitb59fe93059647990ec0174f35f3de79f4d0cdd2e
treec8a0197f71d14fbb2332c0d048e079dde2eb66f7
parentbb8131b1d7350216b30a64c81df8cf19cae717ab
parent41564af2481ec8d0804ac9daf68b0d479ab9a02a
Merge "Remove redundant TextClassificationService" into oc-dev am: 104590844e
am: 41564af248

Change-Id: Ib7c77dd40de6c72bd843af680f59972708a4b121
Android.mk
core/java/android/content/Context.java
services/java/com/android/server/SystemServer.java