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

645e261b

Commit 645e261b authored 2 years ago by Cole Faust Committed by Automerger Merge Worker 2 years ago

Downloads
- Plain Diff

Merge "Fix module-file name collisions" am: 92f4e14b am: b88cb3e1 am: 1d4139e7

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

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

parents 22956fd5 1d4139e7

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

cmds/am/Android.bp 1 addition, 1 deletion

cmds/am/Android.bp
cmds/am/am.sh 0 additions, 0 deletions

cmds/am/am.sh
cmds/appops/Android.bp 1 addition, 1 deletion

cmds/appops/Android.bp
cmds/appops/appops.sh 0 additions, 0 deletions

cmds/appops/appops.sh
cmds/appwidget/Android.bp 1 addition, 1 deletion

cmds/appwidget/Android.bp
cmds/appwidget/appwidget.sh 0 additions, 0 deletions

cmds/appwidget/appwidget.sh

with 3 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