diff options
| author | Tianjie <xunchang@google.com> | 2020-11-03 11:16:33 -0800 |
|---|---|---|
| committer | Tianjie Xu <xunchang@google.com> | 2020-11-03 21:22:59 +0000 |
| commit | 5b58987b7373615f40a50c3f3e168161d8fad42f (patch) | |
| tree | 64e7b25e8fdfa058aa75b57b085c054893db079f /scripts/payload_info.py | |
| parent | 8b1e0dcbca7bbcae0f84124f2898e4f3b7dab895 (diff) | |
| parent | ec7bc11c3103d9310568a391271be52baef273a7 (diff) | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
git merge aosp/upstream-master --commit -s recursive
Test: treehugger
Change-Id: Ifab9f47e1c5bea3898e78df0139d10842b41a44f
Diffstat (limited to 'scripts/payload_info.py')
0 files changed, 0 insertions, 0 deletions