commit | 5a9bf901234f8f5ec228f0008fe9a1b62b7cbe85 | [log] [tgz] |
---|---|---|
author | Jiyong Park <jiyong@google.com> | Wed Jul 01 03:07:23 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 01 03:07:23 2020 +0000 |
tree | ec2385b8bb22493398a1ebdda83b65001bda5c2e | |
parent | a4de4165d78ebaa8805574072e714273b6cc5b99 [diff] | |
parent | 83abe0ebbfc2f633e669ac2935c27ca06a76685b [diff] |
[automerger skipped] Merge "dalvik sysprop settings are optional" am: 98b7b0390e am: dca6860724 -s ours am: fc474209c7 -s ours am: 78719b1c2f -s ours am: 83abe0ebbf -s ours am skip reason: Change-Id Ia3528c0c2f9715ff10b85b549d739c9263ab6a7e with SHA-1 e3668e11d8 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1346182 Change-Id: I82b078a86fdcf0151beaeb2586806e14ee24fdc1