tree cd6c8033e6976af03b9ed3a4efd63066fcc9263f
parent 86d42b69958f22ccb09b203b8428be72153e6e96
parent 8f54ce571e5794f2c84c0c4e095fed1444d8c21a
author Nick Kralevich <nnk@google.com> 1335197947 -0700
committer android code review <noreply-gerritcodereview@google.com> 1335197948 -0700

Merge "FileSystemPermissionTest: add /data/data/recovery/HTCFOTA add /data/data/recovery/OMADM"