| commit | 1fe0c5cae8ac5b30215980eada2a4b5cb96c5782 | [log] [tgz] |
|---|---|---|
| author | Tony Mak <tonymak@google.com> | Tue May 02 15:46:13 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 02 15:46:13 2017 +0000 |
| tree | 72440c3ff79ec81c0f5df6fbab366141a3d81c71 | |
| parent | 62c1e21a250fc0a21f764e669cdd9673f633321e [diff] | |
| parent | 91c6e44e9eddcff179d263221a75dfd4e47911cf [diff] |
Merge "Add back the throwIfParentInstance checking in getAffiliationIds" into oc-dev am: 91c6e44e9e Change-Id: I360c03f15bf8a84d58100e371ed5528db6975f4d