tree 7098b8d11ccb0a75c125bb66ecba7cf575856d9e
parent b8059b4e9103e9902b1496052c140e317c801b31
parent 4e34267c2a51efc85e367229e8f60f45e49a31da
author TreeHugger Robot <treehugger-gerrit@google.com> 1593594032 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593594032 +0000

Merge "Fix jarjar rule for LocalLog" into rvc-dev am: 4e34267c2a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/12018738

Change-Id: I146611e7ae6b8134b545ba3facfd1056b50e195b