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