am b1e3bb27: am b1a9f8cf: resolved conflicts for merge of b6c60285 to stage-aosp-master

Browse Source

* commit 'b1e3bb2798bb6002b186081d9b0234bdfa432a14':
  init: move initial property area allocation into bionic
  property_service: make /dev/__properties__ readable

...

This commit is contained in:

Colin Cross 2013-06-25 16:30:35 -07:00 committed by Android Git Automerger

parent 95b8790717 b1e3bb2798

commit 2a25ca0a24

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available