| commit | 867e00c6f8c6d6c6d63dadb95f44711deca5acf7 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 05:50:38 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 05:50:38 2020 +0000 |
| tree | b94cc73ba58f4d4a99d494b4d7ca8437e15d6437 | |
| parent | 5614a9cdbc605ac34567dd6fb336e82c41328312 [diff] | |
| parent | c382a1065adf66af12b0744760b235e828eeb0ce [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 24f951ee00 am: c382a1065a -s ours am skip reason: Change-Id I508095fa6285ade14dc831dc1ccee2d0486cf76e with SHA-1 5614a9cdbc is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/1431524 Change-Id: I58815c6fc98bf1635a1a849ce2315e98b48389f1