am 22538106: am d8800386: am 2d3730b5: am cb45d6fa: Merge "Change account type strings for AccountManager UI" into ub-gmail-ur14-dev

* commit '2253810635b44672c654cbf6c23f6babbf00c645':
  Change account type strings for AccountManager UI