Merge "Merge "Fix crash on rotation." into nyc-dev am: 075690875b
am: 3d18e1991a" into nyc-mr1-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
bd22827512