i've merged the CLs back in by hand and rewrote the commits in the process.  there was only like 13 commits, so it wasn't a big deal.  the diff between the two repos now is negligible (i dropped the changes to the .gyp file that mattered only when the code was in the aosp tree)

give it a sanity check before i push it ?
https://chromium.googlesource.com/chromiumos/platform2/+log/sandbox/vapier/chromeos-dbus-bindings

Thanks, looks fine to me.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/60a4e827ab69c54efa562735312e174fbb9d19ed

commit 60a4e827ab69c54efa562735312e174fbb9d19ed
Author: Mike Frysinger <vapier@chromium.org>
Date: Sat Nov 25 04:31:23 2017

chromeos-dbus-bindings: move back to platform2

We aren't getting this from AOSP anymore.

BUG= chromium:788211 
TEST=precq passes

Change-Id: I09857cf302f37d504653d29ca984fedbd528a474
Reviewed-on: https://chromium-review.googlesource.com/788511
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Dan Erat <derat@chromium.org>
Reviewed-by: Ben Chan <benchan@chromium.org>

[modify] https://crrev.com/60a4e827ab69c54efa562735312e174fbb9d19ed/chromeos-base/chromeos-dbus-bindings/chromeos-dbus-bindings-9999.ebuild

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/chromeos/manifest-internal/+/719722cdeb3abe6db4dd67ae90a4c77aea833bbb

commit 719722cdeb3abe6db4dd67ae90a4c77aea833bbb
Author: Mike Frysinger <vapier@chromium.org>
Date: Sat Nov 25 07:18:48 2017

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/manifest/+/28cb7d6f379ffa8ca7a4282261dd20776f45eb21

commit 28cb7d6f379ffa8ca7a4282261dd20776f45eb21
Author: Mike Frysinger <vapier@chromium.org>
Date: Sat Nov 25 07:18:49 2017

chromeos-dbus-bindings: move back to platform2

We aren't getting this from AOSP anymore.

BUG= chromium:788211 
TEST=precq passes

Change-Id: I9ed9b824422fb4767312bfff54858c77a75c2777
Reviewed-on: https://chromium-review.googlesource.com/788512
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Dan Erat <derat@chromium.org>
Reviewed-by: Ben Chan <benchan@chromium.org>

[modify] https://crrev.com/28cb7d6f379ffa8ca7a4282261dd20776f45eb21/full.xml