tree dc6628b95e08fe414fc29b8f4b840bdada55c08c
parent 975ee1f25a58e1f5f636248c0b51851767ccc14b
parent 78da7816da1acdb1cce3f4b5943d105c3383debe
author Tyler Gunn <tgunn@google.com> 1495740838 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1495740842 +0000

Merge "Add ability to add existing connection AND set parent at the same time." into oc-dev