tree 91c5dba03fa2ce938e14e13d4a4a46291fbc1f6b
parent d2eed16e01c679e2e00b142d674e794d6b502c62
parent 50b6388ad36c3b02836e567e6782fe6162b47c09
author Jack Yu <jackyu@google.com> 1554265955 -0700
committer android-build-merger <android-build-merger@google.com> 1554265955 -0700

[automerger skipped] Merge "Passing ServiceState as byte array into ServiceStateProvider" am: 17ff1e257f
am: 50b6388ad3 -s ours
am skip reason: change_id I48053f3ae7ed8ce5c24e7406d66c442023ff8882 with SHA1 7d0cabc2f3 is in history

Change-Id: I6a7c4a45883b0b50c03f6cd9bc66cf629b911011