tree 215de069599aad48d252245cda87db357e4cb38d
parent 04ef959d8b21911051d6a68f7a87836d61be8ce8
parent 60b393ce851f04eb749f8e1fc1d030c4991288ca
author Paul Duffin <paulduffin@google.com> 1560494520 -0700
committer android-build-merger <android-build-merger@google.com> 1560494520 -0700

Merge "Make sdkDep/decodeSdkDep the source of truth about the sdk"
am: 60b393ce85

Change-Id: I6d98bc6ddd00b8e51a9b2646c1dcb673603775c4