diff options
| author | Amin Hassani <ahassani@google.com> | 2020-10-29 12:10:05 -0700 |
|---|---|---|
| committer | Amin Hassani <ahassani@google.com> | 2020-10-29 12:15:42 -0700 |
| commit | 42c2f98c87de3fb9342df74881c1e992ad81bee3 (patch) | |
| tree | 2f18f05a8d42990ce8d1744f27208de43760f88d /common/dynamic_partition_control_interface.h | |
| parent | b05e4e2705ea06a2f7772ec2ab2c5353a696226c (diff) | |
| parent | 2fe84323164a95ce83c7936ef8f6c14483f38049 (diff) | |
Merge remote-tracking branch 'remotes/aosp/upstream-master' into merge-cros
Merge back the recent update_engine changes back to Android.
Created by:
$ git merge remotes/aosp/upstream-master --commit -s recursive
No special conflict to resolve.
Bug: 163153182
Test: None
Change-Id: I4c65eb9c57448847857e2339935a5d47c8cb690a
Diffstat (limited to 'common/dynamic_partition_control_interface.h')
0 files changed, 0 insertions, 0 deletions