OSDN Git Service

Merge "Hack around b/36066697." into oc-dev
authorJosh Gao <jmgao@google.com>
Tue, 20 Jun 2017 04:30:07 +0000 (04:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Jun 2017 04:30:07 +0000 (04:30 +0000)
am: e139434e3a

Change-Id: I422d2b73fc854047d1293919c25f0656df0842c9

1  2 
cmds/screencap/screencap.cpp

Simple merge