summaryrefslogtreecommitdiff
path: root/services/java/com/android/server/SystemServer.java
diff options
context:
space:
mode:
authorSorin Basca <sorinbasca@google.com>2021-03-15 12:55:03 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-03-15 12:55:03 +0000
commitdbbc6224dae045146316c2aadd333f1f92d58856 (patch)
treebd395b10552c8705f8188a1c7e71859b23a52381 /services/java/com/android/server/SystemServer.java
parentb7b31d0f5da7b23b795e909d9f19ff2ed4f2dd99 (diff)
parentd5258c36f144db8b6b8d2b99b61992e747c5f27d (diff)
Merge changes from topic "jni-errno-exception" am: 4a6c12e650 am: 3d82c63d2f am: d5258c36f1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619421 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5cb0d95a0eaab330b0763927c92495e50b97cd27
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
0 files changed, 0 insertions, 0 deletions