commit | 4fe609fa484f92c2243af638c0d0dfa846057172 | [log] [tgz] |
---|---|---|
author | Mark Chien <markchien@google.com> | Wed Jul 01 10:11:30 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 01 10:11:30 2020 +0000 |
tree | 0fec9a452b38cb64137ea3df158983a3b8120803 | |
parent | ed7fbea66b177d2f542e371f045e8bf55768e773 [diff] | |
parent | 203c4f19787a917c9bf64d4ce05cf13e3f9fa2c2 [diff] |
[automerger skipped] Merge "Fix tethering jarjar rule for LocalLog" am: 5ac18c5049 am: 13f66a7d24 -s ours am: 203c4f1978 -s ours am skip reason: Change-Id I5f070b96f96aaabf7ec8da52a3d3444ed940fb56 with SHA-1 683932315b is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353287 Change-Id: I746c6a4282f3ff0d32bf6db654bc3b75cfb14669