tree 94d2446c6d5497f009ac8fa5ce00e8b31e274b32
parent 81d1f1821f6e801063b4a4232ae16f4a33b229ee
parent f261da7346a546ff52b2af5319553fc44e5bddf5
author Anton Hansson <hansson@google.com> 1519408454 +0000
committer android-build-merger <android-build-merger@google.com> 1519408454 +0000

Merge "packages/apps/Stk: Set LOCAL_SDK_VERSION where possible." am: e506d26453 am: d3f94353f2
am: f261da7346

Change-Id: Idef4f9ca7b2714b490d423461a40b3ab0298cda6