diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-06-04 01:21:56 +0000 |
|---|---|---|
| committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-06-04 01:21:56 +0000 |
| commit | 4b347da87be20ede40a32874f50316c002c5e658 (patch) | |
| tree | fed1a5e0a6f4bf467dbcd70918655dc12d8008c8 /test/ProfileTestMultiDex/Main.java | |
| parent | c2aa96cf38928f56c4b019adfef2d5530d374abc (diff) | |
| parent | 93b14fd2bdd06a687f7649c8cb1c36fb0849d3fb (diff) | |
Merge changes from topic "am-964807cd469f40829c195d938d449a29" into qt-r1-dev-plus-aosp
* changes:
[automerger skipped] ART: Allow thread suspend lock to be held when dumping a thread am: 56a985ffa0 am: c5c36a1626 -s ours am skip reason: change_id Ib55eafba72c5d15de01719840ba3f223ae4af8c7 with SHA1 7d42cdd505 is in history
[automerger skipped] ART: Skip all-threads dump on abort if locks are held am: 907a085824 am: 5ba9a554e8 -s ours am skip reason: change_id I15ba38a018a39f1cc12577cdf8fb94876b96bbaa with SHA1 ba26b51e2e is in history
Diffstat (limited to 'test/ProfileTestMultiDex/Main.java')
0 files changed, 0 insertions, 0 deletions