tree 73b8a27525669ef7c9dadde57c9cc53df2cf92d0
parent 2a83daa8a3e1eab292dc1464bbe78f025f4bc0e9
parent e7394ba8bd9cd90a0fb72f6c50522a41cd7877fd
author Nick Kralevich <nnk@google.com> 1387321940 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1387321940 +0000

am e7394ba8: am c02c35fb: Merge "restorecon /data/media when re-creating it for multi-user upgrade."

* commit 'e7394ba8bd9cd90a0fb72f6c50522a41cd7877fd':
  restorecon /data/media when re-creating it for multi-user upgrade.