tree c244a1d138d3f71911c7cc8c9a4ef7d0f5413acf
parent 962173f9529e5854e63a803f0b7eaa6e71491545
parent cd5a729d6c24da038511e2a3852aa45d139d513e
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582765239 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582765239 +0000

[automerger skipped] Merge "Revert "Split Stk into a client apk and a lib."" am: 1070174ee0 am: cd5a729d6c -s ours
am skip reason: Change-Id I9f5682f99c73c447a5af8d29ed662f1bd68a0bf6 with SHA-1 d51bbb5c35 is in history

Change-Id: Icdd55aafdc91293b96ab3b7e0bbe3817dede5750