tree 4a276004c0d6387bdfb0a72d4149f1154b139e02
parent 228a9e3a2cc7f13de6ee4ca6ab98abfa65a5ba62
parent 6d983a1b8066a27d75372a611ea794581c0f60e8
author Amit Mahajan <amitmahajan@google.com> 1475776323 +0000
committer android-build-merger <android-build-merger@google.com> 1475776323 +0000

Merge "Stop StkAppService when no CatService is available" am: e3fb871d1e am: 5f8032c4a1 am: f88b3f8092
am: 6d983a1b80

Change-Id: I0c1b445dea12f96812695a91b8457f041310f57f