tree c91aa4942c58eefbb6bf4d229cbc3c486f3d6dfb
parent c610b8fe45d907f20663494e70f96a27d9ed46aa
parent 752450080f3458430bbbcd13d71bc3b10975044b
author Neil Fuller <nfuller@google.com> 1554322896 -0700
committer android-build-merger <android-build-merger@google.com> 1554322896 -0700

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

Change-Id: Ia7d1fdb5766262b53a6d47193d2f73d6d1a7613a