Merge "Don\'t crash the system when detecting a transient wrong state am: f970410afe am: 35ad9d867e" into nyc-mr1-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
87a4877c35