| commit | de6ef23853c05a4ab9210ad2b88fe2c1fc17d168 | [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 | edb8abc40ecbf8967360ef361d5a8b85ecd7bd2e | |
| parent | 57bfa33f20dcbe22c279b1ce5a66d9fdea55707e [diff] | |
| parent | c20caa573b9b4e0171735ae43c5578a207cab4c8 [diff] |
[automerger skipped] Merge "Fix tethering jarjar rule for LocalLog" am: f64be2d725 am: f089dd736e -s ours am: 010a53c408 -s ours am: c20caa573b -s ours am skip reason: Change-Id I5f070b96f96aaabf7ec8da52a3d3444ed940fb56 with SHA-1 8b8e72a00d is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353287 Change-Id: I7305fa95820376f517c7083def6e5ad4df585148