tree 9c94c482f266f9ada70ffa4ce67810b3ac17c940
parent 87de0a3c3c746f90c2d5a189a3d08299209984c3
parent 6271e43e2a8433786ac23c37f30dee13f8fc49a5
author Chong Zhang <chz@google.com> 1462315792 +0000
committer android-build-merger <android-build-merger@google.com> 1462315792 +0000

Merge "Merge "Apply IME adjust to newly added window" into nyc-dev am: 7095d92afc am: 7f42c31e2f" into nyc-mr1-dev-plus-aosp
am: 6271e43e2a

* commit '6271e43e2a8433786ac23c37f30dee13f8fc49a5':

Change-Id: I0d8cfc177bf72aa053ab6f7d00b32b52ba4570d6