tree e0ed4aa9da315cba7f883402458892a05220d2e3
parent 5b03885d4392106faf86072064f08be6dccf71ea
parent ebd04e98ee9d04dc452c4e1073d6554a48518c5e
author Yi Kong <yikong@google.com> 1603223049 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1603223049 +0000

Merge "profcollectd: OTA Observer" am: 14a7d344a4 am: ebd04e98ee

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

Change-Id: I2b7cda7d3d7fe133bb4af6585fb4afca3b0fbaa3