| commit | 60d88ea3dd8f3b0dc592141b9ea09c92b1e753c8 | [log] [tgz] |
|---|---|---|
| author | Tony Mak <tonymak@google.com> | Tue May 02 15:55:21 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 02 15:55:21 2017 +0000 |
| tree | 303ba813cb5958445784b8fca542a04330da876e | |
| parent | ac227b88758e2a015e8a3bddcb404f5dad13a440 [diff] | |
| parent | 1fe0c5cae8ac5b30215980eada2a4b5cb96c5782 [diff] |
Merge "Add back the throwIfParentInstance checking in getAffiliationIds" into oc-dev am: 91c6e44e9e am: 1fe0c5cae8 Change-Id: I2fb7103267fbcf76ede3f168b4d7b4892c501943