| commit | f0a0b5c17677d28471ae447ce51a941c8fc3be02 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 08:01:07 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 08:01:07 2020 +0000 |
| tree | b94cc73ba58f4d4a99d494b4d7ca8437e15d6437 | |
| parent | 68660c64974b239290178b373ea60d2899f8ba1f [diff] | |
| parent | eeed20220a48a305e47044cb0a6ac11674337a9e [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 24f951ee00 am: c382a1065a -s ours am: 867e00c6f8 -s ours am: eeed20220a -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: Ia7595a1b19282f9dcc6375a99e295d0c97f667f7