commit | 916f5361b23e90568b45d1a00b8b2ae1084c1688 | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@android.com> | Thu Aug 06 21:31:13 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 06 21:31:13 2015 +0000 |
tree | 25887763d4e316e9b71245cd20dfc63c46335f6d | |
parent | b77ece08f86909065a586304c38d7cb8cc44f725 [diff] | |
parent | e71cd84088f03e5491c011af66c360b93aa38468 [diff] |
am 94629bde: resolved conflicts for merge of 779a38a5 to mnc-dr-dev-plus-aosp * commit '94629bdec34b253fa2e9cd9ec800715b3c3a4f7f': Protect runtime storage mount points.