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)
commitff1005a6f5f3da396da95d1086c03efba33ab651
tree7fb381a0b721c30369f177d60a721909df441182
parent35e990ce3279af92f92474c7154aa53a4a1bdea4
parentb22aabbbd2801db0be526a64badf2efa208f19f1
am 7745fb9e: Merge "Introduce condition provider services."

* commit '7745fb9e95b6938591a46ffcaace8db02c93962f':
  Introduce condition provider services.
Android.mk
core/java/android/provider/Settings.java