tree 125e606dd0043aca616345cb7190eef8f427aee9
parent e44771afdd0f482d9fd56aa096b3c37af0c48834
parent e5e680bd780763f177c27a14385289aa1e308cf0
author Steven Thomas <steventhomas@google.com> 1492555873 +0000
committer android-build-merger <android-build-merger@google.com> 1492555873 +0000

Merge "Fix query management in GpuProfiler" into oc-dev am: 511544f212
am: e5e680bd78

Change-Id: I1e45492386313e24778936e79b743d709c20a239