tree fa90b6380542cb1af6e040a81af11c3089ec892e
parent 8cb1927666382c5b505586f91ef6c170c22c7315
parent eeecfafc879162959c538e97cbc42c93d142d4bf
author Android Build Merger (Role) <android-build-merger@google.com> 1499303320 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1499303320 +0000

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