am 77cfb2ac: am 03eaa114: Merge "Allow both AOSP and Google account types for Exchange" into jb-mr1-dev

* commit '77cfb2ac0f9cebee277ad890390ffe01b117d3cf':
  Allow both AOSP and Google account types for Exchange