Skip to content
Commit a934d869 authored by Dave Mankoff's avatar Dave Mankoff Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Convert Flags.java to Flags.kt" into tm-qpr-dev... 

[automerger skipped] Merge "Convert Flags.java to Flags.kt" into tm-qpr-dev am: 8c0ea7ee am: 7885577e -s ours

am skip reason: Merged-In I187d4eb8fbf6834eaafeaf465ff07d2f94122f2b with SHA-1 2a237906 is already in history

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



Change-Id: If6d23bf780cceb76c36b12bb17c8a9a108c18d08
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d96ac86f 7885577e
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