tree bc03812838571cd8f195cf280107c9a6dae73b4c
parent 122f77dbac167d7864ff2fdebd2b5b77eb9514e1
parent 83bb512502c3ce7ac92e3fbe8c09f7e62462a803
author Christopher Tate <ctate@google.com> 1564532098 -0700
committer android-build-merger <android-build-merger@google.com> 1564532098 -0700

[automerger skipped] Merge "Fix job persistence & re-inflation"
am: 83bb512502 -s ours
am skip reason: change_id Ia3ab1eb16aeaa85336409368b4340622cec19f4c with SHA1 7f6acc05db is in history

Change-Id: Iee32d7f21321441ff96d096c685bd120a9133f44