tree fbceea84cc6c6d3235f2dabc795ab5a7f72bb016
parent 7a3a03f6bc3511fb909212bae7e3ddfcb6e37fc1
parent fce8034b3ee211c565d5afd2a98ef241c57079fd
author Jeff Sharkey <jsharkey@android.com> 1440686765 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440686765 +0000

am fce8034b: am 2b8f194f: (-s ours) am 1bd078fa: Protect runtime storage mount points.

* commit 'fce8034b3ee211c565d5afd2a98ef241c57079fd':