diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-04-30 18:31:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-04-30 18:31:56 +0000 |
| commit | 0ef47fcf1c54d23bbd4b47c8dbc0003fc6131a86 (patch) | |
| tree | 3d983d0b40bc156a307882d4d58ab9a86b7c17c3 /tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp | |
| parent | b98e968b73d903eb8e7aea53c88ea51d1d49d1ad (diff) | |
| parent | 0e221048796368da50661f55ecc6dcefa5b8dd46 (diff) | |
Merge changes from topic "am-9807f04232de4d5bbe057b52760abf83" into qt-dev-plus-aosp
* changes:
[automerger skipped] Freeze {ipmemorystore,networkstack}-aidl-interfaces as version 2. am: 6b93ec0135 -s ours am skip reason: change_id I079018679766738a97b827bc87a6903655f308dd with SHA1 791dd86528 is in history
[automerger skipped] Merge changes from topic "natt-aidl+aidl-freeze" into qt-dev am: 1447fd97e8 -s ours am skip reason: change_id I9b9a51dc5dc06c90229fb36c34c24258991c4146 with SHA1 76985bd9a5 is in history
Diffstat (limited to 'tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp')
0 files changed, 0 insertions, 0 deletions