summaryrefslogtreecommitdiff
path: root/tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-04-26 21:19:43 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-04-26 21:19:48 +0000
commitdf97663d236a892ecf473e76fb449ae8c221109b (patch)
treeaffdd5e16199534e943d781f98aafbb2d1b28bff /tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp
parent36e4de579aca5325c70c879c282ae04792a692a9 (diff)
parent41b01a579ef25ff16fc7d35143ed871a130aa494 (diff)
Merge "Merge "DO NOT MERGE: change SET_DISPLAY_OFFSET namespace to com.android.permission.* This is to avoid API Level 25 CTS issues. am: 31add96517 am: a701205315 -s ours" into oc-dev am: 9e3c12e173" into oc-dev-plus-aosp
Diffstat (limited to 'tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp')
0 files changed, 0 insertions, 0 deletions