| commit | ed4dc944aa30df03a749b76d304da67fdbb537c8 | [log] [tgz] |
|---|---|---|
| author | Felipe Leme <felipeal@google.com> | Mon May 23 22:21:41 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 23 22:21:41 2016 +0000 |
| tree | 8259b8af665a304699e82299ea25e2e66a1fdcc3 | |
| parent | c5bbe8679b7dea1129a5b05dd1006e8ea45f0a51 [diff] | |
| parent | a7f6a4534c076ef4f84b7f08cbd507e50d71c04b [diff] |
Resolve merge conflicts of 2387813 to nyc-mr1-dev-plus-aosp am: a7f6a4534c * commit 'a7f6a4534c076ef4f84b7f08cbd507e50d71c04b': Expose functions used to add entries to the zip file. Change-Id: I9680c1b12afa378941d776e434789d536e04e4b0