am 35bbbc6c: Merge "Launch account addition activity from Settings instead of...
am 35bbbc6c: Merge "Launch account addition activity from Settings instead of from AccountManager" into jb-mr1-dev
* commit '35bbbc6c':
Launch account addition activity from Settings instead of from AccountManager