tree 9119ada64d3f1b06f69657edd68dd16a904d0d30
parent 58229846d03ce719c5a6ef94975b57f4ed21e87a
parent d60d606eba7af8a52727094861f7d73fbbef550b
author Isaac Chen <ycchen@google.com> 1487700618 +0000
committer android-build-merger <android-build-merger@google.com> 1487700618 +0000

Merge "Turned ENABLE_CPUSETS into runtime decision." am: d95aa50b18 am: 7eca8f7073
am: d60d606eba

Change-Id: Ib114f65ca5eee84dca7510866a15459334ec6460