am 44d1f3c7: am 99c1a416: resolved conflicts for merge of 95a41f6b to stage-aosp-master

Browse Source

* commit '44d1f3c703015b065f009604907033aac8bedf32':
  init: fix copying boot properties
  toolbox: hide property implementation from watchprops
  init: verify size of property buffers passed to property_get
  init: move the system property writer implementation
  init: switch property_get to use __system_property_get

...

This commit is contained in:

Colin Cross 2013-06-17 18:26:18 -07:00 committed by Android Git Automerger

parent 67e3663fc9 44d1f3c703

commit 755ced8064

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