OSDN Git Service

am 7745fb9e: Merge "Introduce condition provider services."
authorJohn Spurlock <jspurlock@google.com>
Fri, 25 Apr 2014 18:21:40 +0000 (18:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 25 Apr 2014 18:21:40 +0000 (18:21 +0000)
* commit '7745fb9e95b6938591a46ffcaace8db02c93962f':
  Introduce condition provider services.

1  2 
Android.mk
core/java/android/provider/Settings.java

diff --cc Android.mk
Simple merge