| commit | 136e2d0d62985a4320e49c9ccd75c4290df5abf3 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Sun May 25 21:23:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun May 25 21:23:02 2014 +0000 |
| tree | 60967da75bb8519130128dc1e9a29b073e15a571 | |
| parent | d4e83f16b5a9219c640021b40bd2536915a05bcc [diff] | |
| parent | b9ca0935862a182762611ba500b2f2642c9aea5f [diff] |
am b9ca0935: am 6556d5d7: am a79febb8: Merge "Fix ExtractToMemMap to show original zip file name in ashmem" * commit 'b9ca0935862a182762611ba500b2f2642c9aea5f': Fix ExtractToMemMap to show original zip file name in ashmem