Skip to content
Commit a21e0751 authored by Orion Hodson's avatar Orion Hodson Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Update to use nativehelper/JNIPlatformHelp.h" into... 

[automerger skipped] Merge "Update to use nativehelper/JNIPlatformHelp.h" into rvc-dev-plus-aosp am: 3e10c511 am: a0be056b am: 3fb01067 -s ours

am skip reason: Change-Id I7af128f42ae89a77a8e3fb113ea533331153c535 with SHA-1 329c612e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11985978

Change-Id: Icdb4b9e87b68f50efbfc03bd6d3d2fb222ab8a78
parents 62761425 3fb01067
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment