Merge "Merge "Adjust divider when IME height is changed." into nyc-dev am:...
Merge "Merge "Adjust divider when IME height is changed." into nyc-dev am: 36d1296c am: 33208571" into nyc-mr1-dev-plus-aosp
am: 1ee1d948
* commit '1ee1d948':
Change-Id: Idfd2c2ea5063713e36968f797263ef3a85fc6dde