tree 77238cbc0278a234de1bee1f111175d117e4568c
parent c933ef6c54741565a2ec8d1dfff6782af6f42153
parent df2a8807757112ca2868120bb09f973511424b77
author Erik Kline <ek@google.com> 1503553498 +0000
committer android-build-merger <android-build-merger@google.com> 1503553498 +0000

Merge changes from topic "offload_cherrypick" am: b09cf3fbf1
am: df2a880775

Change-Id: I3db23fef19fc66a4eee158fb3367f45078b30872