tree b4862e148285335264541edde284b43740aebb8d
parent f1ced9925970351d1ed2824b6973809183ff8309
parent 517bb2b25bb067e40e993637352f1028488d3878
author TreeHugger Robot <treehugger-gerrit@google.com> 1574435815 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1574435815 +0000

Merge changes Id899f3c1,Ib262bc8c

* changes:
  Test child sessions time out in enabling rollback (2/n)
  Rewrite blockRollbackManager (1/n)