Joe Onorato 6f04fef272 Merge changes If51568c3,Idd434c19 into nyc-dev ...

am: 45165c9373

* commit '45165c9373f1bf2dbe0c3f11b271daa24414ea35':
  Demote the log in ProcessState.ensureNotDead from a wtf to a warning.
  @hide SystemHealthManager.from

Change-Id: Ibb36bb8d2c32c0fa8ec85eb093b8281f349158fb

2016-05-18 00:52:11 +00:00

..

android

Merge changes If51568c3,Idd434c19 into nyc-dev

2016-05-18 00:52:11 +00:00

google/android

…