am 9c49f0af: (-s ours) am 688b4a3d: am 4d2b79f9: Merge "Generate DBus proxies and adaptors separately"

* commit '9c49f0affa43b946d2618eb2efbddf15588998c8':
This commit is contained in:
Christopher Wiley 2015-08-27 05:01:53 +00:00 committed by Android Git Automerger
commit 36b59dff5f

Diff content is not available