| commit | 43175e996b055696ad487243806c424bebf8e23e | [log] [tgz] |
|---|---|---|
| author | Jack Yu <jackyu@google.com> | Tue Apr 02 22:31:07 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Apr 02 22:31:07 2019 -0700 |
| tree | 9c5d95f5fed93cdbdffe7eeb97d835f75eace61f | |
| parent | ca6adaafc9a9b621d2f387aa26942d789c301174 [diff] | |
| parent | 3e05a45cf3371ad70227bf4611f4a5fca4c15810 [diff] |
[automerger skipped] Merge "Merge "Passing ServiceState as byte array into ServiceStateProvider" am: 17ff1e257f" into stage-aosp-master am: d8c9d64bdf -s ours am: 3e05a45cf3 -s ours am skip reason: change_id I48053f3ae7ed8ce5c24e7406d66c442023ff8882 with SHA1 7d0cabc2f3 is in history Change-Id: I0949987a7309f5322388433fcdd846eff4c98f8e