OSDN Git Service

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

Change-Id: Ia3ff30c7121c808b95a6aca9cc087ccb5e67cc14


Trivial merge