diff options
| author | Julius D'souza <jdsouza@google.com> | 2017-04-26 21:18:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-26 21:18:54 +0000 |
| commit | 41b01a579ef25ff16fc7d35143ed871a130aa494 (patch) | |
| tree | ca6ed286e0792bc840e5a3e91236fee794e3f9d7 /tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp | |
| parent | 2b7a0bdf88ab228bd17d335f89db3825f84dc396 (diff) | |
| parent | 9e3c12e1739f369dda20319b1174a9e2538f25ea (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" into oc-dev
am: 9e3c12e173
Change-Id: I4b5a02f21a394aaa5ec73c88070fdb853b49d68c
Diffstat (limited to 'tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp')
0 files changed, 0 insertions, 0 deletions