tree c91aa4942c58eefbb6bf4d229cbc3c486f3d6dfb
parent eb89189ff654b2b0ceed1f2165aab31b62ffa8e5
parent f1f3f02131d335b7ed20ab8347cbf4b8d5ca0c97
author Neil Fuller <nfuller@google.com> 1554325515 -0700
committer android-build-merger <android-build-merger@google.com> 1554325515 -0700

Minimal fix for merging jars with dir entries am: b7120f2b23 am: 752450080f
am: f1f3f02131

Change-Id: Ic9fbe1fed744031b97f6826c2750524c6e787bf6