commit | b59ccea88f1ba4e1a18d378fb9e2a35fc89e055e | [log] [tgz] |
---|---|---|
author | Nick Kralevich <nnk@google.com> | Tue Feb 04 21:34:13 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 04 21:34:13 2014 +0000 |
tree | b2a98c7e4b597cc08a5899d07284f145989e5640 | |
parent | 9ed3784cb368b02bf06fb714d0fbb4fbac27a04c [diff] | |
parent | 9988ea6d4546fb101e39b9680ee7a33873f4bcd8 [diff] |
am 9988ea6d: am 52af04dd: Merge "Add file_contexts entries for socket files." * commit '9988ea6d4546fb101e39b9680ee7a33873f4bcd8': Add file_contexts entries for socket files.