tree 15a85254df04a9233ade5283028ceb2d866a3e5a
parent d0f3e8588a58e1687ca4336609e809351e94e2d8
parent 4d71493e74ed1ea39e554146351cc39e47cb5d02
author Geremy Condra <gcondra@google.com> 1364010892 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364010892 -0700

am 4d71493e: am e849970c: Merge "Fix mode on /data/security."

* commit '4d71493e74ed1ea39e554146351cc39e47cb5d02':
  Fix mode on /data/security.