tree 842d4e2ff4b1e00918c66902bdc7ad50321d7195
parent e4a673ddefbeec1231f57936efdb72f19c5e3856
parent 1fca8e91f32dc8b13d3129b7ef4a0194839736e6
author Brian Carlstrom <bdc@google.com> 1400878259 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1400878259 +0000

Merge "Fix ExtractToMemMap to show original zip file name in ashmem"