summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorXiao Ma <xiaom@google.com>2021-11-02 03:59:57 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-11-02 03:59:57 +0000
commit6d9cc9b2e8db93ec99fcf6e3bcfe83158feaff21 (patch)
tree1a914abfad6bf06b1a4e3bbd004782cdc1483f39 /core/java/android
parent3abca59b51c67599bd55a5552026fc1a3046b201 (diff)
parentadde671086c1165048428e19389f697ca83730d2 (diff)
[automerger skipped] Merge "Add a separate namespace for Tethering module." am: 8f2ec1df33 am: 2300efc24c am: 421813d450 am: b3920be9ef am: adde671086 -s ours
am skip reason: Merged-In I393d25f4c1a15927686c984e47c01f2646d0867d with SHA-1 e5fea201ca is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1873993 Change-Id: I4d601c3e2a6f9d193c36bde0b3a51f732155d47b
Diffstat (limited to 'core/java/android')
0 files changed, 0 insertions, 0 deletions