summaryrefslogtreecommitdiff
path: root/tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@google.com>2017-02-03 01:55:08 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-02-03 01:55:08 +0000
commit0bf6be2d512a4aa082f351d08ccada0f861f55a9 (patch)
treeaef533a7423ca0fa4e494d170e0b5556ae831606 /tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp
parent152071c954bd59e69bd291a257d0b8260dd5724d (diff)
parentd44a36588d84a4b57c7a4d25d451bc5ed2d38396 (diff)
Merge "Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5 -s ours am: f82c373074 am: 8c9ff68173 am: 4b3c59005b am: 394357761e -s ours am: bafa3c1d3b am: 7cd3c47c29 am: 770eff87cd am: ce15555148 am: 0792846ea5" into nyc-mr2-dev-plus-aosp
am: d44a36588d -s ours Change-Id: I0303bfd708783236b9c0e6daf138ed7a6f2ef109
Diffstat (limited to 'tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp')
0 files changed, 0 insertions, 0 deletions