Merge "Merge "Guard against app info crash" into nyc-dev am: c3ab03e
am: 9f6fcdf" into nyc-mr1-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
647e70f5c1