tree e6c493f78085569eb8ec9ce1743d524f2e8f4cd4
parent 69718bc311d481283012b8eb79b4f4726d8c287f
parent d3f073510eea5a4202b2a37cdb22e19271ba18b2
author Keyvan Amiri <keyvana@google.com> 1483484735 +0000
committer android-build-merger <android-build-merger@google.com> 1483484735 +0000

Merge "Fixed focus recovery failure on API 15" into nyc-support-25.1-dev
am: d3f073510e

Change-Id: I708914ca775f8f5377d8ad0ca2152e0c47107406