| commit | b5e47621293e265402b372bcf2f380ab8a49247d | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Sep 20 12:53:20 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 20 12:53:20 2013 -0700 |
| tree | 6919e0636fb2e3ed7a9cbeb63746976b48b00afc | |
| parent | 1c479c56da44c8942ab3d858ebcc19e4a6f76786 [diff] | |
| parent | e4e91c4ead821afb5aced2e33ee39d8878eb4d1e [diff] |
am e4e91c4e: resolved conflicts for merge of e678897f to klp-dev-plus-aosp * commit 'e4e91c4ead821afb5aced2e33ee39d8878eb4d1e': Proper security labeling of multi-user data directories.