| commit | 15bd6917198449eb47491a4df43fc1631d5a30d1 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Thu May 25 19:55:18 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 25 19:55:18 2017 +0000 |
| tree | 6589169ff37c5d7e37736c3101c8fc7b6397006f | |
| parent | 78a16ae984cd45e0d358b20572effd6633003b6a [diff] | |
| parent | 2d932458bcc0ce43bec9425523ad036794a95c0e [diff] |
Merge "Add ability to set parent at the same time as adding a connection." into oc-dev am: 60da84f041 am: 2d932458bc Change-Id: I46ba03b854d6ddbd50c9862f38b525c21b2b72c7