tree f7836ac8349c325ecf882eaec4e59346615d9c77
parent aa25204f43421fe363238176d74e68eb8cdb5b01
parent c93904b445830cd17fd9dd6d4fe236987577a478
author Nick Kralevich <nnk@google.com> 1389816956 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389816956 +0000

am c93904b4: am e847f429: Merge "restorecon /data/misc/media."

* commit 'c93904b445830cd17fd9dd6d4fe236987577a478':
  restorecon /data/misc/media.