tree c7af091837e76cc4f7f800d70e8b4235d7b2e283
parent b9b40ebc9013558f4a4a741ddcbab73b9d92d315
parent 1070174ee0dbf5192a084ff4c2e815536405bd46
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582764493 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582764493 +0000

Merge "Revert "Split Stk into a client apk and a lib."" am: 1070174ee0

Change-Id: I38d05db267c77d935befd2cd48742dc78f9fecb0