tree 0b8a186a4c9cda5c328b52a3f8d4e36489b14b16
parent ef5937da95fdc6cbb4a57189c26441c8093763ba
parent 2d22fac6f8f0679332da353c74ebbbaa19c43da1
author Raman Tenneti <rtenneti@google.com> 1571262712 -0700
committer android-build-merger <android-build-merger@google.com> 1571262712 -0700

[automerger skipped] Merge "Re-enable the following tests in pre-submit:   cts.AlarmManagerTest#testSetRepeating,   cts.SystemFeaturesTest#testSensorFeatures" am: ebe03edac6 am: 06097b7258 -s ours
am: 2d22fac6f8 -s ours
am skip reason: change_id Iffec912af4ee9dd3de2090a31bd475abc5016854 with SHA1 02cbff4425 is in history

Change-Id: I939bdf54b341744f89070140ad06f19c79feeb31