tree 52030331344ff1694d53c266892379bb92704370
parent dec65547e2c83ec6e2d1f27ace63bb9f66a32601
parent 7eca8f707397d018beb1ee75badb1c0563eddd39
author Isaac Chen <ycchen@google.com> 1487700179 +0000
committer android-build-merger <android-build-merger@google.com> 1487700179 +0000

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

Change-Id: I96e38dc38e372a27990b9cd1bda9f04676f13eb8