tree 2c499d4bc777b96f4129b0fa25ab9d036c47c89d
parent 8268a75e86c086c4618c2f8d8e9531eb8d7b30f5
parent b9994d22274d95a2234cbd8be8338d5e0c16a290
author Jean-Baptiste Queru <jbq@google.com> 1344459986 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344459986 -0700

am b9994d22: am 8261d271: Merge "restorecon tombstone directory."

* commit 'b9994d22274d95a2234cbd8be8338d5e0c16a290':
  restorecon tombstone directory.