tree fad3c7d515ef8a0110b0a1fa0b9c7fde1ac5a9b6
parent 896d585dddb27e0648eaebf6543de544e8a2127a
parent eea249464532bea80f20e48db8834778b995097a
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1574706082 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1574706082 +0000

Merge changes from topic "am-551fb4ad91ea487f8283d44e5a3c01a2"

* changes:
  [automerger skipped] Merge changes from topic "migrate_CtsStagedInstallTest_RollbackTest" am: 63e6d6af01 am: 00190cf8a6 am: c376fb681c -s ours am skip reason: change_id I5e5c154758b3f0e4731696c813519ac798fbbae9 with SHA1 a859e8affc is in history
  [automerger skipped] Increase timeout in testNativeWatchdogTriggersRollback am: 5f01cb9246 am: 5a6df15108 am: 3a86bceed3 -s ours am skip reason: change_id I2a98e71102fc1cbf6ea712e070d6db49cdb05cba with SHA1 56d58a0493 is in history
  [automerger skipped] Fix flaky testEnableRollbackTimeoutFailsRollback test am: 1d66bf8c48 am: 79e8fcb4ae am: 4371b2a00e -s ours am skip reason: change_id Id94d5452836b07d6f802758bd0dfdd3c276a3c05 with SHA1 b61fac95f5 is in history
  [automerger skipped] Wait for available rollbacks in RollbackTest. am: 77a40731f8 am: 170a519878 am: 129a2c09ac -s ours am skip reason: change_id I27e2513b34f49af2f41cd627a5d2550541831e11 with SHA1 0a3c06e9c9 is in history
  [automerger skipped] Include NewRollbacks in result of getAvailableRollbacks. am: dc4a36105b am: b63dfa2d3b am: eb559106bd -s ours am skip reason: change_id I015ee5925e38118c40f4b9e145f78fb12c0e2890 with SHA1 0672808c27 is in history
  [automerger skipped] Rename RollbackData to Rollback. am: 91fc4db14e am: b646e555e8 am: d0d7a014c3 -s ours am skip reason: change_id I5ae3866753d6badcdf019525b40522937568dee5 with SHA1 8d512eeb95 is in history
  [automerger skipped] Remove INSTALLED_USERS extra from ACTION_PACKAGE_ENABLE_ROLLBACK. am: 87a504d1fc am: 682e501c2a am: ab81c07bb0 -s ours am skip reason: change_id Iffd63977a7498e3cba20d2039af623c921d38f57 with SHA1 48f3cf476c is in history
  [automerger skipped] Update to new RollbackUtils.sendCrashBroadcast API. am: 3e7ef5ae0b am: a39bd708e4 am: 6ff24063ff -s ours am skip reason: change_id Iaaa728aa58d894ba546677e8295faba2ebfc5e64 with SHA1 0c03aaae84 is in history
  [automerger skipped] Extend ROLLBACK_COMMITTED broadcast for the multi-user case am: e92720ddb9 am: 4bcb79bb71 am: e243c75188 -s ours am skip reason: change_id I8e20da321f52ebf9e6d584a8c59d2a3106a32212 with SHA1 65e90bab69 is in history
  [automerger skipped] Fix NullPointerException. am: b4bad064d8 -s ours am: d0654a76f3 -s ours am: 21640f381f -s ours am skip reason: change_id Ic007e44264647793c6271c3923c13c9e1736a9de with SHA1 17bfed91cc is in history
  [automerger skipped] Cleanup some obsolete TODOs and unused code. am: cda1a17516 am: 01178b4f9d am: 38467d7eef -s ours am skip reason: change_id I67610d3467d737cbfc085f00ea0b509b63f4612b with SHA1 d006f75672 is in history