| commit | b1e3bb2798bb6002b186081d9b0234bdfa432a14 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Mon Jun 24 17:22:56 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 24 17:22:56 2013 -0700 |
| tree | 56ba9ef61c85eb2f591b634f6b7eef4bb56c736b | |
| parent | 372d668a279934ff3b2ec2f07a76fe2f351789d5 [diff] | |
| parent | b1a9f8cf4b15a861ab998a4c5f0c69068f22c62a [diff] |
am b1a9f8cf: resolved conflicts for merge of b6c60285 to stage-aosp-master * commit 'b1a9f8cf4b15a861ab998a4c5f0c69068f22c62a': init: move initial property area allocation into bionic property_service: make /dev/__properties__ readable
diff --git a/init/devices.c b/init/devices.c index 69f5fc8..de27a7a 100644 --- a/init/devices.c +++ b/init/devices.c
@@ -785,6 +785,7 @@ file_free_out: free(file1); free(file2); + free(file3); data_free_out: free(data); loading_free_out: