summaryrefslogtreecommitdiff
path: root/libs/hwui/service/GraphicsStatsService.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-10-11 22:16:07 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-10-11 22:16:07 +0000
commit54bfe3acddef1c15ed662afa90c2d0791a122d23 (patch)
treec901d5ac3407bcc98b36b3e9a26e9eb531cd0150 /libs/hwui/service/GraphicsStatsService.cpp
parent289b4d8c5399c0db2dda1fbde5c95db7e1e9bffd (diff)
parentb969ac5fd0173446f05dc3e930de61321fcab80e (diff)
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours am: 7f108b81b3 am: 4a71a2daf6 am: e2a1e9f7d8" into oc-mr1-dev-plus-aosp
Diffstat (limited to 'libs/hwui/service/GraphicsStatsService.cpp')
0 files changed, 0 insertions, 0 deletions