Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 154c391e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add UpsideDownCake to aapt2 codenames and android.os.Build" into... 

Merge "Add UpsideDownCake to aapt2 codenames and android.os.Build" into tm-dev-plus-aosp am: c3a19b4d am: 823481d2

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



Change-Id: I3bd44f20a4cd1fb9b241a419da02bbfaef00dc22
Ignore-AOSP-First: this is an automerge
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2148d090 823481d2
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment