app_Settings

Go to file

Xin Li 7c297fa38a [automerger skipped] Merge ab/7061308 into stage. am: ad3fa60e26 -s ours

am skip reason: Change-Id I35fe00aeeb112d5d9971985619e3ec5095dcdb7b with SHA-1 8e18b5b69d is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13657604

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id3a2aa451dcf23ec4e2b00b48e35d14542a34187

2021-02-23 09:05:06 +00:00

libs

Update proto for contextual_card_list.

2018-11-06 15:48:03 -08:00

protos

[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings

2021-02-12 17:08:01 -08:00

res

Merge "Implemented nearby button that displays wifi sharing intent and long press button that opens wifi qr share fragment" am: d1b9b7f87f am: 72dad8bc9d

2021-02-05 01:27:56 +00:00

src/com/android/settings

Merge "Update new owners for battery pages." am: c2c5de6199 am: 9e3bb7026c