tree 0b97625d77fd61aa17781a93a33dbb8a645e531f
parent fa7efb1ef474b2ffa1bc07fb2bcca3b0e084c6e8
parent dba9e126ec01187c5cf094641424385b731c72e8
author Jack Yu <jackyu@google.com> 1560488042 -0700
committer android-build-merger <android-build-merger@google.com> 1560488042 -0700

Merge "Fixed incorrect merge service state" into qt-r1-dev am: 9544faab4a
am: dba9e126ec

Change-Id: Ieeb751136cb3840982dd51a9db36a1f39e701407