OSDN Git Service

Merge "Add back the throwIfParentInstance checking in getAffiliationIds" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Tue, 2 May 2017 15:38:44 +0000 (15:38 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 2 May 2017 15:38:48 +0000 (15:38 +0000)

Trivial merge