| commit | f6d68cfdc06ba4be4661afa0642eba8a54246608 | [log] [tgz] |
|---|---|---|
| author | Mark Chien <markchien@google.com> | Wed Jul 01 10:28:38 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 01 10:28:38 2020 +0000 |
| tree | 0fec9a452b38cb64137ea3df158983a3b8120803 | |
| parent | be521eec2af4895da4fa76552c3134390cfd83f5 [diff] | |
| parent | 4fe609fa484f92c2243af638c0d0dfa846057172 [diff] |
[automerger skipped] Merge "Fix tethering jarjar rule for LocalLog" am: 5ac18c5049 am: 13f66a7d24 -s ours am: 203c4f1978 -s ours am: 4fe609fa48 -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: I7305fa95820376f517c7083def6e5ad4df585148