am 277626e5: am 844306bd: am cc4499b6: Merge "adb: use correct header file."

* commit '277626e59dc0ccbf0337ec6615622f46e6f958fd':
  adb: use correct header file.
am d1439a7f: am b3be89df: am 3fb63338: Merge "android_filesystem_config.h: change ping and run-as"

* commit 'd1439a7f8eb228eb39dd74845a5e46d20c63b3b0':
  android_filesystem_config.h: change ping and run-as
Reconcile with jb-mr2-release - do not merge

Change-Id: I20987b51211410332c427eb876334b0c6a9bcc32
am 68fa5114: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '68fa5114fe56297763a50a9090793eaae300aaa2':
  Add directory for mediaserver
am 7c646cd3: am af4ececc: am 515bed0e: Merge "run-as:  set the SELinux security context."

* commit '7c646cd3594283bc4aaf53a0b10143a76281270f':
  run-as:  set the SELinux security context.
am 95b087fa: am 79d4381a: am 69f3ec84: Merge "Fix issues where the filename is referred to as \'sideload\'"

* commit '95b087fa90c89b21d18268c84167d1407f9e7905':
  Fix issues where the filename is referred to as 'sideload'
am bf6982ce: am 7c646cd3: am af4ececc: am 515bed0e: Merge "run-as:  set the SELinux security context."

* commit 'bf6982cec4b258f3e87d70d1767d69ab30e72ad2':
  run-as:  set the SELinux security context.
am ed64c3ff: am 95b087fa: am 79d4381a: am 69f3ec84: Merge "Fix issues where the filename is referred to as \'sideload\'"

* commit 'ed64c3ff536ea122a430b4cd42aa6e7a56454ba7':
  Fix issues where the filename is referred to as 'sideload'
am 81b5b5fb: sync: factor sw_sync functionality out of header

* commit '81b5b5fb02a59a443877363b1451328c7ad11fb2':
  sync: factor sw_sync functionality out of header
am 00977e58: am 81b5b5fb: sync: factor sw_sync functionality out of header

* commit '00977e5833a25bffd96d446ee39a25a6baf41a19':
  sync: factor sw_sync functionality out of header
am 4c8c35d0: Merge "move goldfish stuffs to device/generic/goldfish" into jb-mr2-dev

* commit '4c8c35d06ce6a673c6e015b809f94da0083cd4cc':
  move goldfish stuffs to device/generic/goldfish
am 6a955d72: am 4c8c35d0: Merge "move goldfish stuffs to device/generic/goldfish" into jb-mr2-dev

* commit '6a955d72ff8b5d4daafe9ce4df6d94d3effa99ea':
  move goldfish stuffs to device/generic/goldfish
ueventd: allow platform devices to have just a /devices/ prefix

When using device tree, platform devices may not have a
/devices/platform/ path prefix, but can be rooted in
/devices/.

Modify the platform device tracking code to store the device
path as well as the name. This way, when we create symlinks, we
can correctly skip the base platform device prefix and get to the
proper device node path.

Change-Id: I939ef8fbcb45c5c803cd9a054e40136a912efc72
Signed-off-by: Dima Zavin <dima@android.com>
Document new -obb flag for adb backup

Now that adb backup handles OBB file backup/restore.

Bug: 6718844
Change-Id: I5d0a1f95a52a6f15908691697ee29b077436b089
am 598169e7: Merge "charger: accomodate minui change" into jb-mr2-dev

* commit '598169e7687ea831a495f9fa7dd7677c740d64d3':
  charger: accomodate minui change
am 6dd79c1e: am 598169e7: Merge "charger: accomodate minui change" into jb-mr2-dev

* commit '6dd79c1e5a138cb59f05fe7a7c2fd3c78a47e1d4':
  charger: accomodate minui change
am 2fa2dfd1: Merge "init: prevent action being added to the action_queue twice" into jb-mr2-dev

* commit '2fa2dfd105204b84a7a32e8fe790793ba23c7f87':
  init: prevent action being added to the action_queue twice
am 03544b3f: am 2fa2dfd1: Merge "init: prevent action being added to the action_queue twice" into jb-mr2-dev

* commit '03544b3f18d99c5994a205e308cf96874f02de35':
  init: prevent action being added to the action_queue twice
Merge "Document new -obb flag for adb backup"
am 7b8970c5: fastboot: add support for some obscure args.

* commit '7b8970c577c788c9af582dac797c63b3134b201e':
  fastboot: add support for some obscure args.