tree 222b8db9269457a28b97706497b9418d86d8fe87
parent c7b91ee05a0fff03764482e7b28e014be0c9b578
parent cb2490c645e8fb98ed36338215ce7e86c7ba2b3e
author Tianjie Xu <xunchang@google.com> 1496193675 +0000
committer android-build-merger <android-build-merger@google.com> 1496193675 +0000

Merge "Remove the obsolete UnpackPackageDir() in edify generator" am: f7a76f9a30
am: cb2490c645

Change-Id: Ibfb2a433d379cf62540e09cc71d81cfdef67dbf8