am 845999d2: Merge "Allow adb to listen both on usb and tcp." into jb-mr1-dev

* commit '845999d232298043c899820c3e9f56e3c00a5845':
  Allow adb to listen both on usb and tcp.
am cdde4524: am 845999d2: Merge "Allow adb to listen both on usb and tcp." into jb-mr1-dev

* commit 'cdde45242edbe5bd931233304aa7e71a811a0638':
  Allow adb to listen both on usb and tcp.
am 831cbc9d: libnl: Add nla_put_u8/u16/u32/u64() wrapper

* commit '831cbc9d2958d1553acd4f58e52569fab4fd64c5':
  libnl: Add nla_put_u8/u16/u32/u64() wrapper
am e9cdf550: am 831cbc9d: libnl: Add nla_put_u8/u16/u32/u64() wrapper

* commit 'e9cdf55088d99003f6100392335d481190e92d70':
  libnl: Add nla_put_u8/u16/u32/u64() wrapper
Reconcile with jb-mr1-release - do not merge

Change-Id: I595f70b0e854d3a42bf2c5121bc6f175a83ab9a2
am 8928b092: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '8928b092b6f4158d77627d3faa6ebce3ca13f412':
am 3016e34b: am 697b6379: am 7b682c47: Merge "Add Mips support to libpixelflinger"

* commit '3016e34beba2b977ec1dc1897f4a311ceb7cee2d':
  Add Mips support to libpixelflinger
am d6fd7606: am 3016e34b: am 697b6379: am 7b682c47: Merge "Add Mips support to libpixelflinger"

* commit 'd6fd760694409d342252a6e48831c6099956c7fc':
  Add Mips support to libpixelflinger
am 98ebf197: am 2ff60998: am 605f8706: Merge "Add Mips architecture to system/core/include"

* commit '98ebf1975f68ffeaa43d5c53964c3dabe8655562':
  Add Mips architecture to system/core/include
am 9eeca544: am 98ebf197: am 2ff60998: am 605f8706: Merge "Add Mips architecture to system/core/include"

* commit '9eeca5445d20354211eae3e177ce14b30dfefda5':
  Add Mips architecture to system/core/include
am 605103fb: resolved conflicts for merge of 4dcd52ab to jb-mr1-dev

* commit '605103fb553a8b872aa8dd0aef76ae8b3bfe47fa':
  Add support for reloading policy from /data/system.
am 2fec4de5: am 11c783f1: am 9494f297: Merge "Implement SELinux/MAC checks for property service."

* commit '2fec4de5c704afe4dc2a1bb976699a0e363786dd':
  Implement SELinux/MAC checks for property service.
am a0347971: am 605103fb: resolved conflicts for merge of 4dcd52ab to jb-mr1-dev

* commit 'a0347971dec3dc34c6ccebad5170ced255fdf35f':
  Add support for reloading policy from /data/system.
am 4f04c51d: am 2fec4de5: am 11c783f1: am 9494f297: Merge "Implement SELinux/MAC checks for property service."

* commit '4f04c51da98ee13464082bee961dc3f095f10aa7':
  Implement SELinux/MAC checks for property service.
am 9a7b9aab: am 79e30b6c: am ae8927aa: Merge "Fix a print format warning"

* commit '9a7b9aab08e5640a08b312807dc57fcd469a77f2':
  Fix a print format warning
am 3424b4fd: am 9a7b9aab: am 79e30b6c: am ae8927aa: Merge "Fix a print format warning"

* commit '3424b4fdde67ea1d8f7b2a75c370cd0a93973e65':
  Fix a print format warning
am 84dcf091: Collapse IMS tags into a prefix check.

* commit '84dcf091482b8d0f484e665915d354069a8c879b':
  Collapse IMS tags into a prefix check.
am 937458f7: am 84dcf091: Collapse IMS tags into a prefix check.

* commit '937458f7c21f7732acb48da2e96b98f887c69bce':
  Collapse IMS tags into a prefix check.
Make usage() static in du.c to avoid conflicts

Change-Id: Ic6b036d050943fb5f0af8553c081ca75362167e8
am 2a1067d1: am 753b96cf: am dd56039c: Merge "Fixed an unused param warning in logcat"

* commit '2a1067d144be5437df98ddb0f2d3680f03dafa5f':
  Fixed an unused param warning in logcat