commit 078d16a114f43274417368cd82409b8d47dea894
author Nick Kralevich <nnk@google.com> Thu Sep 12 12:20:31 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 12 12:20:31 2013 -0700
tree 044cf4316ad73d7a666ad1d15ac15d67b2ea27c2
parent 3a034924636fba05dd03974cf58eaa8171628b58
parent 3381f76568696825b318a757d45ade69b9bed8b2

am 3381f765: am 3638a6bc: FileSystemPermissionTest: Add more directories

* commit '3381f76568696825b318a757d45ade69b9bed8b2':
  FileSystemPermissionTest: Add more directories

tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java

diff --git a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
index c0860d3..6c568ce 100644
--- a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
+++ b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
@@ -356,6 +356,7 @@
                     "/data/data/recovery/HTCFOTA",
                     "/data/data/recovery/OMADM",
                     "/data/data/shared",
+                    "/data/diag_logs",
                     "/data/dontpanic",
                     "/data/drm",
                     "/data/drm/fwdlock",
@@ -431,6 +432,7 @@
                     "/data/system",
                     "/data/tmp",
                     "/data/tombstones",
+                    "/data/tombstones/ramdump",
                     "/data/tpapi",
                     "/data/tpapi/etc",
                     "/data/tpapi/etc/tpa",