diff options
| author | Julius D'souza <jdsouza@google.com> | 2017-04-26 21:27:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-26 21:27:23 +0000 |
| commit | c5b142de04375e06dadd41ab3f5f058575aed280 (patch) | |
| tree | f2ba1c8d87583255634e331cef6a096ebc09803f /tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp | |
| parent | 2ed27dc7dee8c4bc112c0567950d6ef59809ea74 (diff) | |
| parent | 837dd545f9e79cd0ebb6d276af37cdcbd4db8ffc (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
am: 837dd545f9
Change-Id: I2ee01c0f3094f1aa97c91a8b2e6ee139a715121d
Diffstat (limited to 'tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp')
0 files changed, 0 insertions, 0 deletions