| commit | a32c7e8f9df1612d690a34258c014be661dc66ca | [log] [tgz] |
|---|---|---|
| author | Geremy Condra <gcondra@google.com> | Mon Mar 25 15:08:43 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 25 15:08:43 2013 -0700 |
| tree | 22689c0eaa40827e8a67003b0b92292839edb1b6 | |
| parent | 21a34de7a87a55b608dd2b694e4522bd9d17e277 [diff] | |
| parent | a9af6c37868c0c3295fe16b7c0865fbbf3dd2c4f [diff] |
am a9af6c37: (-s ours) am 48718c85: Merge "Proper security labeling of multi-user data directories." * commit 'a9af6c37868c0c3295fe16b7c0865fbbf3dd2c4f': Proper security labeling of multi-user data directories.