OSDN Git Service

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

Change-Id: Ib8af22eada217f99e59646b1edba90a1901cb094


Trivial merge