tree bb39fbc60b46878143cec506d76f9a79abf68873
parent 8baf7c8bbb319bebbe6c3bb9101802a1549112c4
parent 292ef72cc46c21d7f1a5e7fe63960e1662d2d2d7
author Mathieu Chartier <mathieuc@google.com> 1430508266 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430508266 +0000

am 292ef72c: am 4c7518e1: am 9a4cdf5c: Merge "Look at map extensions before /dev/ + ashmem." into mnc-dev

* commit '292ef72cc46c21d7f1a5e7fe63960e1662d2d2d7':
  Look at map extensions before /dev/ + ashmem.