Merge "Protect against crash on user switch" into nyc-mr1-dev

am: 1ec6ccdafc

Change-Id: I2edf21711175ac334d4af82ac93c324eed6a1ae8
This commit is contained in:
Jason Monk
2016-09-20 20:53:36 +00:00
committed by android-build-merger

Diff Content Not Available