OSDN Git Service

Merge "Add config option to enable/disable pause workaround."
authorTyler Gunn <tgunn@google.com>
Mon, 14 Aug 2017 23:54:12 +0000 (23:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 14 Aug 2017 23:54:12 +0000 (23:54 +0000)
am: 9282d725f0  -s ours

Change-Id: I6e54ff11618e8a49cb20391f10f8f79adc61463d


Trivial merge