tree 325793b32ab462b72ecf410dd21e7ae2daee5f7f
parent d9c74020a559bc9719206295b495fe382b2cd1cd
parent 03e970672c8e3868a29b7b2079ce1fed61073338
author Linux Build Service Account <lnxbuild@localhost> 1394615978 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> 1394615977 -0700

Merge "staging: android: ashmem: Avoid deadlock with mmap/shrink"