tree e076a313f77cb9fdfe7da02bd5023bf382f022b5
parent 684f5ffc34ccd8d6c360cd99e2dbb4513dd007e2
parent 58fc12e8fabfab5e3c9b945e5a74bd19058d0ab7
author Lucas Dupin <dupin@google.com> 1527646615 -0700
committer android-build-merger <android-build-merger@google.com> 1527646615 -0700

Merge "Do not request focus during wake and unlock" into pi-dev
am: 58fc12e8fa

Change-Id: If45bd1074dc22c732074cfc59896614d4b28ab22