Merge "adb: Only use properties on device builds"
Merge "libcutils: Don't build host property support"
Merge "properties.h: avoid duplicating constant values"
Merge "property_get: do argument checking."
fix strncat misuse

The third argument of strncat() tells how much data to append from
src, not the total size of the buffer.

Change uses of strncat() to strlcat(), which has the buffer overflow
protection behavior intended by the original author.

This fixes the following compiler warning:

In function 'strncat',
    inlined from 'print_type' at system/core/toolbox/lsof.c:76:12:
bionic/libc/include/string.h:142:5: warning: call to __builtin___strncat_chk might overflow destination buffer [enabled by default]

Change-Id: Id69edc641de3cb87d1867a409cd57b04b12f90a7
fix another misuse of strncat

This has the potential to overflow "buffer" if the command line
is more than 4K.

Change-Id: Icdfed0d9d21804f290b75787ef3809e0475b14f0
Fixed reversed output in netstat Recv-Q Send-Q columns

Change-Id: I2bc7ac6c886808910212432497f05e34596f5e85
Merge "Fixed reversed output in netstat Recv-Q Send-Q columns"
am 59fa7e10: Merge "Fixed reversed output in netstat Recv-Q Send-Q columns"

* commit '59fa7e107d43a4ef521413ec0bb7b0c2a5525071':
  Fixed reversed output in netstat Recv-Q Send-Q columns
HACK: cutils: restore record_stream temporarily

Restore the record_stream code in cutils that was removed
in e00a12bf8a99eb6c4f278efa503488aa21dd8d4d as part of cutils
cleanup.

Unfortunately, there are some prebuilt vendor libs that rely on
this functionality that we cannot currently rebuild.

Remove at the earliest possible convenience once the vendor libs
have been fixed.

Bug: 9189218
Change-Id: I5d44126756f1e3ed194d1b5873d64d9154183199
Signed-off-by: Dima Zavin <dima@android.com>
am 603746f0: am 59fa7e10: Merge "Fixed reversed output in netstat Recv-Q Send-Q columns"

* commit '603746f0e3b645954f33be36f7602cc8205cb71c':
  Fixed reversed output in netstat Recv-Q Send-Q columns
Merge "HACK: cutils: restore record_stream temporarily"
fix bad return value in dhcp_do_request_*

1. bad return status make it return uninitialized prefixLength with a magic
number in android_net_utils_runDhcpCommon()
2. it will make DhcpInfoInternal.makeLinkAddress() to throw
IllegalArgumentException when try to connect a Wifi AP
3. the exception will make system reboot, of cource it random.

Change-Id: Iabc0cd5b69c1316f4eeae0aa1b8a91444dca4562
Signed-off-by: Michael Wu <michaelstay@gmail.com>
remove unused SF event log tags

Change-Id: I1271875c575aac31568017a17622f4dc9ff40032
Add webviewchromium to BOOTCLASSPATH.

Add /system/framework/webviewchromium.jar to BOOTCLASSPATH. This jar
contains the implementation classes for the new WebView. It has been
processed with jarjar to ensure that it doesn't define any classes
outside of com.android.

Change-Id: If65913638df0088f4dd7d62a087750b90038a7fb
init: prevent action being added to the action_queue twice

Property triggers may cause an action to be queued twice, resulting
in a loop in the action queue.  Keep actions that are not on the queue
in the list_empty state (act->qlist->next == act->qlist), and only
add them to the list if they are in that state.

Bug: 8335133
Change-Id: I3a3ec18176cf19cbaa3a45220a03c7560eacfe79
Merge "fix bad return value in dhcp_do_request_*"
resolved conflicts for merge of c0df50af to stage-aosp-master

Change-Id: I949cce9e1f14cd33162b81fbc6728c64e2b09b7c
am 0a0a8768: resolved conflicts for merge of c0df50af to stage-aosp-master

* commit '0a0a8768cbc9ce36d3c9a0cc712dc8c309811565':
  fix bad return value in dhcp_do_request_*
Merge "Add webviewchromium to BOOTCLASSPATH."