tree 91c5dba03fa2ce938e14e13d4a4a46291fbc1f6b
parent 8475fa5c99d914505b4f0e074da549f0c26f411a
parent 7bc818be88bcfc7f8e34c599f6d0f1b704c4c80b
author Jack Yu <jackyu@google.com> 1554265189 -0700
committer android-build-merger <android-build-merger@google.com> 1554265189 -0700

Merge "Passing ServiceState as byte array into ServiceStateProvider" am: 17ff1e257f
am: 7bc818be88

Change-Id: I31adec6bbd4737df9571c7ada3b0b1618b998ce0