tree 10da860fcff71886af91d082e31f0e1917926848
parent dfc7aa263e5effabd46c5821cba3827a078d8d42
parent d38814177c6cff6e20c5e0346946deb3f8f0f925
author Chris Wren <cwren@android.com> 1414566235 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566235 +0000

am d3881417: 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 'd38814177c6cff6e20c5e0346946deb3f8f0f925':