tree e384ead0a75152f4722e4b42a8cbf0845e00c493
parent 0509e5c850fb833499daa766fef6d139dddb4ea7
parent 1dd52a8017040c60b6b91af13399065c19dbe29f
author Erik Kline <ek@google.com> 1505950751 +0000
committer android-build-merger <android-build-merger@google.com> 1505950751 +0000

Merge "have OffloaderController store and re-push more state" into oc-mr1-dev
am: 1dd52a8017

Change-Id: If3a859736a1b3730e4e3d0d2685f3e5432927796