tree 05305e82f0edb297aedd5f9c82426cf8662202dc
parent f75fd5a781b1daaffb78bbc62d8906c25cf408f5
parent 3ade5edabf6a5624a8f20fa9b4cecee3b035b0f7
author Paul Hu <paulhu@google.com> 1640142691 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1640142691 +0000

Merge "Remove NSD_ON setting" am: 02124fb14f am: 06a06836ae am: c7ec38668e am: 3ade5edabf

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

Change-Id: Ia269346654746ebb527c589a43bf5c21fc605f52