tree a57dde2e31356af1a8dc8ac1bbdd309767b40499
parent 5d5eba17c967d345dab9469c41c6f00d3a894dc4
parent 48cca289dfaeacdc40b6b506293eb4fe8cee7df0
author Evan Rosky <erosky@google.com> 1524169977 -0700
committer android-build-merger <android-build-merger@google.com> 1524169977 -0700

Merge "Don't crash during layout of non-attached but focused view" into pi-dev am: 62bb0802f9
am: 48cca289df

Change-Id: Iea6f1656939f3630cee634d0054167204faf6829