[automerger skipped] Merge "Use new DeviceConfig.SYNC_DISABLED_MODE_* constants" into udc-dev am: a31862ea01 am: df70e057a4 -s ours
am skip reason: Merged-In I7ce69fca7c680e91938f1f7798f7f33bf28849a9 with SHA-1 a19c6e615b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21956368
Change-Id: I3749159d1b5455fbd152c56c040d80ef74afc4ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: