tree 936c48137c13373d8ce636b167277cd26001fd3b
parent e997acd693fcbf20f214ccb42a121555bb851c80
parent 9544faab4a6b3e96b0662762eec11ad6e283e56d
author Jack Yu <jackyu@google.com> 1560486459 -0700
committer android-build-merger <android-build-merger@google.com> 1560486459 -0700

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

Change-Id: I88e719ecd81b3a2cd0bf0eeb51e6a0ed58f6dea2