tree 22689c0eaa40827e8a67003b0b92292839edb1b6
parent 21a34de7a87a55b608dd2b694e4522bd9d17e277
parent a9af6c37868c0c3295fe16b7c0865fbbf3dd2c4f
author Geremy Condra <gcondra@google.com> 1364249323 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364249323 -0700

am a9af6c37: (-s ours) am 48718c85: Merge "Proper security labeling of multi-user data directories."

* commit 'a9af6c37868c0c3295fe16b7c0865fbbf3dd2c4f':
  Proper security labeling of multi-user data directories.