tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent f36857e8b9d7d315d486e1ab1cd864c9be468622
parent affeccf1b557c214490bc7c2d90bf0d07f2c198b
author Chris Wren <cwren@android.com> 1392410190 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410190 +0000

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

* commit 'affeccf1b557c214490bc7c2d90bf0d07f2c198b':