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

8750762c

Commit 8750762c authored 4 years ago by Michael Groover

Downloads
- Plain Diff

resolve merge conflicts of 540b50bb to qt-qpr1-dev

Bug: 173421434
Change-Id: Ie3b327c2ab900616b2137d8347d5e8560484ec40
Merged-In: I9b8786a321b1ba79d81b74c3041589f30df8e9c8

parents 6d4ff2e0 540b50bb

No related branches found

No related tags found

No related merge requests found

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

data/etc/privapp-permissions-platform.xml 1 addition, 0 deletions

data/etc/privapp-permissions-platform.xml
telephony/java/android/telephony/SubscriptionInfo.java 17 additions, 2 deletions

telephony/java/android/telephony/SubscriptionInfo.java

with 18 additions and 2 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