Merge "Prevent crash on uninstall." into nyc-mr2-dev

am: f755dfb89e

Change-Id: I26ed997c0dcebe43199529f7871c1b94edc0e119
This commit is contained in:
Ruben Brunk
2016-12-14 00:35:05 +00:00
committed by android-build-merger

Diff Content Not Available