tree 0d75ae46f58911fdcc50add5a1bd6a8f0cafc7f7
parent 48908139b325d5d871826be32c1e7a118487e4ed
parent 512e9743697d34539ae9a214e2798db06b1d38ad
author Benjamin Schwartz <bsschwar@google.com> 1551164297 -0800
committer android-build-merger <android-build-merger@google.com> 1551164297 -0800

Merge "power.stats: Specifying opaqueness of some members" am: b0650fe1d5
am: 512e974369

Change-Id: I25202640bc7b551f1305bec3b598a75a9f533bf6