Merge "Merge "Fix a few issues with ime adjust/minimized dock stack" into nyc-dev am: 96b2fe6a4e am: e19f2f2fc9" into nyc-mr1-dev-plus-aosp
am: ba79d8a396
* commit 'ba79d8a3964d7e8faab1f611b4a7e3459d27a9d5':
Change-Id: Ifa144f25761768aef92cdbf8bfc49a80f63874b8
This commit is contained in: