tree 66448c85315567c82ac93e472b03b30fdd192d56
parent 2be1f8c3f4d338c7b7c73bb642bc410ef27c8ee4
parent 7340fc8665ae3f9f1978f42aa0e5e1da85036158
author John Spurlock <jspurlock@google.com> 1398449946 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1398449946 +0000

Merge "Introduce condition provider services."