OSDN Git Service

Merge "Merge "Merge "Merge "Better logging infrastructure in OffloadHardwareInterface...
authorErik Kline <ek@google.com>
Thu, 6 Jul 2017 01:29:22 +0000 (01:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 01:29:22 +0000 (01:29 +0000)
commit9402f7dd1f50a8e1b4a234b2aaa40eb58cde9d08
treecd7292b1d14aa42e2d29c0d77dcb14fc7c142051
parent83647d7072a9a723f7a5ce3624b1cd953d345adf
parentbb8568d903f2bc731d8cfd8eea9932895881cc7b
Merge "Merge "Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94" into stage-aosp-master am: 6340d93571" into oc-dev-plus-aosp am: 41d52b1bb2  -s ours" into oc-dr1-dev-plus-aosp
am: bb8568d903  -s ours

Change-Id: I0dc49bb82c746b829fe0adede37852c60d612395