tree 9815073b722dd0fe45c42f4ef3800ddb659cd382
parent 31078d777ce2fbaa7c405d3b396940e2193626e3
parent 9da105bb321e4c28db6fd88a2d6cb01852ffefe2
author TreeHugger Robot <treehugger-gerrit@google.com> 1516465745 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1516465745 +0000

Merge "add atoms for cpu power calculation"