OSDN Git Service

Merge "Fix race condition in MediaHTTPConnection" into pi-dev am: d7c87b74d9
authorMarco Nelissen <marcone@google.com>
Wed, 20 Jun 2018 22:40:22 +0000 (15:40 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Jun 2018 22:40:22 +0000 (15:40 -0700)
am: 7a72844fd5

Change-Id: Ie8a4a2ec2c6df33aba1d48d0b89f400a75c1233d


Trivial merge