tree fdd894960ab983c746ea3ed05c68d2c19c59a8de
parent cb0b703b3c3213ea2510e9c5068f7c4a78c42547
parent bcf00b61ddf429c4fdb9e9f420498c156ed4aecd
author Andrei-Valentin Onea <andreionea@google.com> 1603121161 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1603121161 +0000

Merge "Add enabledSince support for compat changes" am: c90a797b8e am: 33edcd4dbc am: bcf00b61dd

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

Change-Id: Ia5d2e78398f907f45d0904927974a403f8476b22