tree cb0c7069508fa0cd541802930358f11c4d63c38d
parent a1e1d0053b0918218439c102bfffccba7f155af8
parent 09bb9f66a0c258d3393145d31529de92e55e039a
author Ben Gruver <bgruv@google.com> 1366911724 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366911724 -0700

am 09bb9f66: Merge "Ensure the intent firewall dir exists before starting the FileObserver" into jb-mr2-dev

* commit '09bb9f66a0c258d3393145d31529de92e55e039a':
  Ensure the intent firewall dir exists before starting the FileObserver