tree 0bc2dfbfaafb537a26c7f19284291bbf574ceaa1
parent fb84668f7864ecf0220e913dc15c252dcc814bcc
parent ed61c723723928c72b391586ea328b0b219defd3
author Mike Frysinger <vapier@chromium.org> 1401978038 -0400
committer Mike Frysinger <vapier@chromium.org> 1401978471 -0400

Merge branch 'merge-login_manager-rewrite' into merge-login_manager

BUG=chromium:330883

Change-Id: Ieaa53b7ebf96cd694b5b76c9750b440cd2384a43