diff options
| author | Julius D'souza <jdsouza@google.com> | 2017-04-26 21:07:46 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-26 21:07:46 +0000 |
| commit | 7ac2d2d30a0c9ed2087408d84195c4f985b7e712 (patch) | |
| tree | f760f7962119f547487fe8324ee4993441868f48 /tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp | |
| parent | 4ff13244a39fa4b48c160c4b697e3bce8eb49ce0 (diff) | |
| parent | 2da6587b9183ebbc45a5a6caa87a2cb41d9f24c3 (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 am: 27b18cc632 -s ours" into oc-dev-plus-aosp
am: 2da6587b91
Change-Id: I59b86164dea86358fb3344dfa51370353e73b12d
Diffstat (limited to 'tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp')
0 files changed, 0 insertions, 0 deletions