tree 998dafc92c8b19e79ed54d7aff74183113d9d495
parent 5954752ffb8b3d85412fd9784b5e3b20dee0854a
parent 788f4309acf618f305ea0ca3b6564a8120da8c40
author Chong Zhang <chz@google.com> 1466200138 +0000
committer android-build-merger <android-build-merger@google.com> 1466200138 +0000

Merge \\\"Do a forceLayout if pending insets is changed after relayout window\\\" into nyc-dev am: 2756d0707f am: dba235d91a
am: 788f4309ac

Change-Id: I3de76ea399768aa9f9cc504bdcb25208e60c579d