| commit | 755ced8064786dfe3f23a92faddecc7aeca93c70 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Mon Jun 17 18:26:18 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 17 18:26:18 2013 -0700 |
| tree | 44097a14ab90d4b625e2f1bf9d1b8d36f7d94549 | |
| parent | 67e3663fc93c65b69b5d121db05b0833b98d97f1 [diff] | |
| parent | 44d1f3c703015b065f009604907033aac8bedf32 [diff] |
am 44d1f3c7: am 99c1a416: resolved conflicts for merge of 95a41f6b to stage-aosp-master * 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