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:17:12 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-04-26 21:17:18 +0000
commit837dd545f9e79cd0ebb6d276af37cdcbd4db8ffc (patch)
tree1e993c30a68703cea1d8a7fc835cb39c0ab7c506 /tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp
parentb664a0148c4c8a1721463d2519bc6f5555c7bc91 (diff)
parent62c3ae1bffc0c551910131b2f5ff294069075d34 (diff)
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 am: 4334664267" into oc-dev-plus-aosp
Diffstat (limited to 'tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp')
0 files changed, 0 insertions, 0 deletions