tree ddfd54ddbe7e1fc7fa1f7edd8b296d34aebe298f
parent 48d27f0a902c9295ffb28405ec6a4d51ac4eea68
parent 4138b21087cc97327a1eeef38865837f02457501
author Nick Kralevich <nnk@google.com> 1369938660 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1369938660 +0000

Merge "FileSystemPermissionTest: allow /dev/hw_random" into jb-mr2-dev