commit | 3e05a45cf3371ad70227bf4611f4a5fca4c15810 | [log] [tgz] |
---|---|---|
author | Jack Yu <jackyu@google.com> | Tue Apr 02 21:35:43 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Apr 02 21:35:43 2019 -0700 |
tree | 91c5dba03fa2ce938e14e13d4a4a46291fbc1f6b | |
parent | 70165f0045f6cb0a71f2eaa40dac9218af966251 [diff] | |
parent | d8c9d64bdf382c1dc77f0282736d576753e89c55 [diff] |
[automerger skipped] Merge "Merge "Passing ServiceState as byte array into ServiceStateProvider" am: 17ff1e257f" into stage-aosp-master am: d8c9d64bdf -s ours am skip reason: change_id I48053f3ae7ed8ce5c24e7406d66c442023ff8882 with SHA1 7d0cabc2f3 is in history Change-Id: I669296387e2f1ae3bdee021378abf27a050574f6