tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent e2cefa3a61d6654d66febcd756e4e32d3005af08
parent b5a6d49e81e3e9d5835c6883f6b876099949e34c
author Chris Wren <cwren@android.com> 1392411564 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411564 +0000

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

* commit 'b5a6d49e81e3e9d5835c6883f6b876099949e34c':