tree 445d3364b5b5b4b492dc62dcbdc7127ab1d3e23d
parent f54b7abdd82798c2c4cc9aa8bf271c259c03435d
parent d09f7d0edcd523dcfd769215084aa7ef51918640
author Andre Eisenbach <eisenbach@google.com> 1467071762 +0000
committer android-build-merger <android-build-merger@google.com> 1467071762 +0000

Merge \\"Add extra waiting when switching users\\" into nyc-dev am: 4d6be6b308
am: d09f7d0edc

Change-Id: Ibb19ab5bdf094a250706b2d32de169f61c221a76