am bb0fbdbe: Merge "logd: liblog: 64-bit issues"

* commit 'bb0fbdbefd7079859e4df45f1b75ad6c48839a50':
  logd: liblog: 64-bit issues
am 66e95d76: Merge "Fix adb forward --list when forwarding a lot"

* commit '66e95d76c47a3a099931bbebe7f4a0af4d3f7fbb':
  Fix adb forward --list when forwarding a lot
am 1367854a: Merge "adb: fix windows build after "forward --list" fix."

* commit '1367854a891090d1be1edfb12515691b20b350cf':
  adb: fix windows build after "forward --list" fix.
am 33e86e00: Merge "libcutils: add method to get klog level"

* commit '33e86e004037765ef97a1d7f4017a7bdb6312bcf':
  libcutils: add method to get klog level
am 9f4d558e: Merge "ueventd: easier debug logging"

* commit '9f4d558e0c80602aa8707ec9d0bdd33a93aa4f16':
  ueventd: easier debug logging
am 0c3d19ff: Merge "libcutils: 64-bit compile issues"

* commit '0c3d19ff3db7b04081a7a729a81642c5903f741a':
  libcutils: 64-bit compile issues
am b2c34ece: Merge "adb: Don\'t clobber block devices during push"

* commit 'b2c34ece647c212baa30c474394c498a2d6dd61f':
  adb: Don't clobber block devices during push
am 44390474: Merge "adb: Don\'t unlink special files on sync failure."

* commit '443904746301e4d519e51075487ea4c8b9a860e3':
  adb: Don't unlink special files on sync failure.
libadfhwc: use %zu for logging size_t

Change-Id: Ica75935a194509f9d85d8e577b81f9de03aaaea4
Signed-off-by: Greg Hackmann <ghackmann@google.com>
remove pixelflinger from healthd

The minui library has changed to no longer use libpixelflinger.  It
also offers a more efficient way of storing and loading frames of
animation; use it to represent the battery-full state images.

Also removes the unused battery_charge.png image.

Bug: 12131110
Change-Id: I6cc8b19f36a806c99cda30cc47b5968daf6b333b

Conflicts:
	charger/charger.c
	charger/images/battery_0.png
	charger/images/battery_1.png
	charger/images/battery_2.png
	charger/images/battery_3.png
	charger/images/battery_4.png
	charger/images/battery_5.png
	charger/images/battery_charge.png
	healthd/Android.mk
Merge "remove pixelflinger from healthd"
Merge "libadfhwc: use %zu for logging size_t"
Added transfer progress reporting for push and pull commands.

Added a new '-p' switch to the 'push' and 'pull' commands that outputs
the file transfer progress (bytes transmitted, total bytes, and % done).
This provides useful feedback when transferring large files, and also
makes it possible for other tools to easily monitor the progress of a
forked push/pull command.

Change-Id: Iee6f42f5bd41292e5bc80fba779f526f0072e356
Merge "Added transfer progress reporting for push and pull commands."
don't load property_contexts from /data

Bug: 12613118
Change-Id: I5a84b13d2151075d5136e3682431fbcc9307df13
(cherry picked from commit dc3a42bb11dc2aefee37f799b5a1cce87cf35aaf)
logd: default user space logger

Change-Id: I16825c26f098241376d4014f3a8e93174387dbcf
Merge "logd: default user space logger"
Merge "don't load property_contexts from /data"
init.rc: prep tcp_default_init_rwnd, set the default to 60

The kernel's default is between 4~20.

Prepare for javaland to modify the value at runtime.

It can be done via
  setprop sys.sysctl.tcp_def_init_rwnd  <value>


Bug: 12020135
Change-Id: Id34194b085206fd02e316401c0fbbb9eb52522d2
(cherry picked from commit 7c862c8b5e59cbe216a5bc092c01f1ecba8e9de4)
am cb0bb7c5: Merge "remove pixelflinger from healthd"

* commit 'cb0bb7c5f48d4441902282a1ceaf32c5defd10db':
  remove pixelflinger from healthd