tree 02c2a59c16f9f3ac86d6785dd9a88ba08abb52c5
parent 27f0879140e17a300ec66ff4c67e72ce690ae458
parent 7b559562f743e61f1dc2bcbb4fb2a58d19b4cc0e
author Neil Fuller <nfuller@google.com> 1646230274 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646230274 +0000

Merge "Command-line interface: NetworkTimeUpdateService" am: 8ac370e63f am: 7b559562f7

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

Change-Id: Ia2389b5e2018bc27a19e4a8bc057baaa37e544fe