OSDN Git Service

Merge "Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am...
authorErik Kline <ek@google.com>
Thu, 6 Jul 2017 01:27:04 +0000 (01:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 01:27:04 +0000 (01:27 +0000)
am: 8cb1927666  -s ours

Change-Id: I5fb2cadcf585687a3c3d3d0f6ba5b3fc035803db


Trivial merge