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.
am 9efab70f: am 7b8970c5: fastboot: add support for some obscure args.

* commit '9efab70fc590933389b01b565f9e8d9c1c719e01':
  fastboot: add support for some obscure args.
am 0c06eb50: DO NOT MERGE - Document new -obb flag for adb backup

* commit '0c06eb5017e5888f0452da348d12fc92a767e45d':
  DO NOT MERGE - Document new -obb flag for adb backup
am 8a1eb12a: (-s ours) am 0c06eb50: DO NOT MERGE - Document new -obb flag for adb backup

* commit '8a1eb12a713694f2ae5ddac9ea3cab7518fc059b':
  DO NOT MERGE - Document new -obb flag for adb backup
am dd0d0e78: am 822ea9b3: am fd5c6b9f: Merge "Close adb_usb.ini after reading it"

* commit 'dd0d0e78afb5b809983fe9cebac8cc5d54a284b6':
  Close adb_usb.ini after reading it
am f8c71067: am dd0d0e78: am 822ea9b3: am fd5c6b9f: Merge "Close adb_usb.ini after reading it"

* commit 'f8c710670fe991d83cc24c51210d78d7eaf0b114':
  Close adb_usb.ini after reading it
rootdir: goldfish: mount debugfs on boot time

goldfish is ported to linux-3.4 and have capability to run atrace.
But can't run atrace yet because debugfs is not mounted on boot time.

Change-Id: I0ce23bde3b8d1b2a88d4238272123e3ab8cb6970
Signed-off-by: Young-Ho Cha <ganadist@gmail.com>
am 53a02884: ueventd: allow platform devices to have just a /devices/ prefix - DO NOT MERGE

* commit '53a0288463c3fd88fb7f2cfa37c0e985eb1870f4':
  ueventd: allow platform devices to have just a /devices/ prefix - DO NOT MERGE
am ac19623f: (-s ours) am 53a02884: ueventd: allow platform devices to have just a /devices/ prefix - DO NOT MERGE

* commit 'ac19623f88203247cf4b710bdc70e3c26b18bdee':
  ueventd: allow platform devices to have just a /devices/ prefix - DO NOT MERGE
am 7398664d: am c8b3fee4: am f9094401: am 75f29709: am 09b43645: (-s ours) am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '7398664de30cf953b791ab5aeeb37dfd57410698':
am 758045fa: (-s ours) am 7398664d: am c8b3fee4: am f9094401: am 75f29709: am 09b43645: (-s ours) am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '758045fad588da0dfa00c2148ce18dbbf0d26cae':
Reconcile with jb-mr2-release - do not merge

Change-Id: If556a8aade619e94ef8cf3bfa2f65d4efa2c4550