Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

platform_frameworks_base-old
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

b1606f58

Commit b1606f58 authored 11 months ago by Treehugger Robot Committed by Automerger Merge Worker 11 months ago

Downloads
- Plain Diff

Merge "Support properties in path when merging overlay configs" into main am:...

Merge "Support properties in path when merging overlay configs" into main am: 9cdfcfb2 am: 0c5ddec4

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

Change-Id: Ifb9a20b24fab96fce20ac532b83971f0cd89eb65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 1f5ebd52 0c5ddec4

No related branches found

No related tags found

No related merge requests found

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

core/java/com/android/internal/content/om/OverlayConfigParser.java 98 additions, 3 deletions

.../com/android/internal/content/om/OverlayConfigParser.java
core/tests/coretests/src/com/android/internal/content/res/OverlayConfigParserTest.java 119 additions, 0 deletions

...android/internal/content/res/OverlayConfigParserTest.java

with 217 additions and 3 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment