tree 54acc3afbb9a11970223f05b01ad9fc1649d879f
parent 9fe129457180e59585d30b0a6d4ad352fdbbdb2a
parent 862ad2f66333d90cbe8f3fe608ec1d67f5c57c04
author Christopher Ferris <cferris@google.com> 1440652225 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440652225 +0000

am 862ad2f6: (-s ours) am 4a4ba40e: Update all mapoff checks to check against 0.

* commit '862ad2f66333d90cbe8f3fe608ec1d67f5c57c04':