| commit | 44d1f3c703015b065f009604907033aac8bedf32 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Mon Jun 17 18:24:39 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 17 18:24:39 2013 -0700 |
| tree | 5d6364d0c3cec229ab99f78e6ef61b22883ad66d | |
| parent | 88411498b3341dbf8f2976991524b1e21dedc6f6 [diff] | |
| parent | 99c1a4168ba792437f298d31cd4631ff01661476 [diff] |
am 99c1a416: resolved conflicts for merge of 95a41f6b to stage-aosp-master * commit '99c1a4168ba792437f298d31cd4631ff01661476': 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