tree 3fbe3bbc9b13f1349cd15dc40f6639975a5c9c2b
parent 77a069fe7f187a7664312652f87c564023d0b6a1
parent d32b891ff3fc3785f10c31ec02e65f24cd2b7d30
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576336189 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576336189 +0000

Merge "Decouple addition of new sdk member types from sdk code" am: 0558ecce51 am: d32b891ff3

Change-Id: I04782158204c35fcc74a6af3472599a4474ed5d3