tree f37577ab3d9e0601d9f83b950ea8bd074d50b57a
parent 6ea9add679cc0de8c6b132e9d0bffba75b1d4d47
parent 129d71d8ceafe6e03484b59d44d34c972e92dd0d
author Chris Wren <cwren@android.com> 1381348705 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381348705 -0700

am 129d71d8: Merge "move the provider authority to a config class" into jb-ub-now-indigo-rose

* commit '129d71d8ceafe6e03484b59d44d34c972e92dd0d':
  move the provider authority to a config class