tree e6ab0e0606b94b009d903714a7664f5b1bbc64f1
parent eaa9ce7064ad4978d5acaafd4e797b5186ff03de
parent 1b12ab00998b96046ef617a8d109fadcf29a1b39
author Geremy Condra <gcondra@google.com> 1369253114 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369253114 -0700

am 1b12ab00: am 9c759e39: Merge "Fix SELinux get.. methods aborting on invalid address"

* commit '1b12ab00998b96046ef617a8d109fadcf29a1b39':
  Fix SELinux get.. methods aborting on invalid address