commit | bb262062b97a88d65e4648e13dd9e0bd9fcc4695 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 00:39:57 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 00:39:57 2020 +0000 |
tree | 60e5936946acde1a831c8fb5f027a7d8a85a4312 | |
parent | 270fd81dc349d1fc75850604d0911780d269e572 [diff] | |
parent | d0c42f389a4a919878bfab7ceca2e845e42c2c08 [diff] |
[automerger skipped] Merge Android R am: d0c42f389a -s ours am skip reason: Change-Id I54d04ed92be7cdaa42c5be776f666d772e1a5214 with SHA-1 270fd81dc3 is in history Original change: https://android-review.googlesource.com/c/platform/external/gptfdisk/+/1422353 Change-Id: I1d6a1a452e8c8e8536d995b20b1193e0106190fb