am 31a02dba: Fix build

* commit '31a02dba709166df30b7c3352222c550146d7c81':
  Fix build
am 71619f13: am 604f52e3: Reconcile with AOSP master

* commit '71619f13956e44c1b8cb18ddb29bd2522020a7f8':
am 70212a40: Merge "Gracefully handle truncated log messages." into ics-mr1

* commit '70212a404a46c6a2d4830e721156c3fafbfb1a3a':
  Gracefully handle truncated log messages.
am 04a87590: restart surfaceflinger and drmserver when servicemanager dies

* commit '04a875902ece07769101a5202e3af554af31a911':
  restart surfaceflinger and drmserver when servicemanager dies
am a7997f4a: am d4f29767: Merge "Remove log spam" into ics-mr0

* commit 'a7997f4ae27b5c07eb7dbfd2ac0e99472a950855':
  Remove log spam
am 3e3d0780: am 6fb3df8d: Merge "charger: make the almost-full frame only show when it\'s current level" into ics-mr0

* commit '3e3d0780fcc8da7f9917b3f9d05e16ffc08d4b6f':
  charger: make the almost-full frame only show when it's current level
am e7184667: am 4f7c0843: Merge "libnl_2: Fix memory leaks" into ics-mr0

* commit 'e71846671e6dbb2ece3142be92b33ff85f713997':
  libnl_2: Fix memory leaks
am 0e4d9eb8: Reconcile with ics-factoryrom-2-release

* commit '0e4d9eb8f89be601d8b499e5fe40e2a25fca1bce':
  Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
  Revert "Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0"
  Revert "Merge "Remove log spam" into ics-mr0"
  Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
am 6182d031: Reconcile with ics-factoryrom-2-release

* commit '6182d031d7a1968c2edc8862bb5a9bc5bc8922e9':
  Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
  Revert "Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0"
  Revert "Merge "Remove log spam" into ics-mr0"
am 3c58933a: am 4a253908: rootdir: init.rc: write default oom_adj before starting ueventd

* commit '3c58933aa785ab26f77284f6a1a4e93d2ebfcf04':
  rootdir: init.rc: write default oom_adj before starting ueventd
am c761b54e: Merge "Wimax: wimax related changes for libnetutils" into ics-mr1

* commit 'c761b54ead5ec3f22fafb7ce50dd5c5a1939b03f':
  Wimax: wimax related changes for libnetutils
am 61b90bd2: adb: grant it AID_NET_BW_STATS for full /proc/net/xt_qtaguid/stats

* commit '61b90bd211021886049f72cb666a5b49b83b3c64':
  adb: grant it AID_NET_BW_STATS for full /proc/net/xt_qtaguid/stats
Fix build

Change-Id: Icbe57024e6018600d47a68132f53f15d7602dc92
am 25a89e77: Fix build

* commit '25a89e771aae292193244852166564e83e36232b':
  Fix build
am b90cb1d2: am c6023243: Reconcile with ics-factoryrom-2-release

* commit 'b90cb1d20c7d5701e073bf5293a64bfa57861782':
am 2a38657d: Merge "DO NOT MERGE - disable memory dumps" into ics-mr1

* commit '2a38657dfcb5655e3e900a3d25695864f3d023a3':
  DO NOT MERGE - disable memory dumps
am f9c1fcc5: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1

* commit 'f9c1fcc505d59fd87392e6af7341b1737f186081':
  Replace vendor specific NfcGoogle.apk with generic Nfc.apk
am ce48083f: Fixes ADB crash on Windows due to large number of connections. do not merge.

* commit 'ce48083fc90cee807dd66608e2c3e496145af9ff':
  Fixes ADB crash on Windows due to large number of connections. do not merge.
Reconcile with ics-mr1-release

Change-Id: I90f80bed70319b9973996b74f78b421b87eef8e7
am b1dfffe6: Fix \'adb backup\' on Windows

* commit 'b1dfffe6bb506313a3bc9146d2f6f8c533213193':
  Fix 'adb backup' on Windows