diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2017-02-03 01:59:51 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-03 01:59:51 +0000 |
| commit | a6d7668119c3a54d4a76f0a8bfde1f9fa521e610 (patch) | |
| tree | aef533a7423ca0fa4e494d170e0b5556ae831606 /tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp | |
| parent | a3f0337ca5820fcf2aaa4999eb464839ab91cbf2 (diff) | |
| parent | 651c9cd390886f8932c7e5a50093ac945d2e26b2 (diff) | |
Merge "Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am: 0354b89d31 am: 5536402f6d am: 6db504c6f6 am: 609145c315 am: af86efd70d" into nyc-mr2-dev-plus-aosp
am: 651c9cd390 -s ours
Change-Id: Ica80e2af4f50e9e629654723021741bea53be930
Diffstat (limited to 'tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp')
0 files changed, 0 insertions, 0 deletions