tree 77238cbc0278a234de1bee1f111175d117e4568c
parent d3d6ddea9495302db405db296bb0cbf9f214b7b1
parent b09cf3fbf1c7e340bc06e8aba06461d4a0bae457
author Erik Kline <ek@google.com> 1503552824 +0000
committer android-build-merger <android-build-merger@google.com> 1503552824 +0000

Merge changes from topic "offload_cherrypick"
am: b09cf3fbf1

Change-Id: Icb4332b34bc8b940a2c30beab143f7136e0178de