Merge "Merge "Fix crash on rotation." into nyc-dev am: 075690875b am: 3d18e1991a" into nyc-mr1-dev-plus-aosp
am: bd22827512
* commit 'bd2282751263e7c73c4e319a0982d5f5830aca66':
Change-Id: I833313c8a9c65526c26d0cfed5c31d741cf4f6a2
This commit is contained in: