tree ff58189bc296a808edf836007448245aae37e67c
parent 57dfec017a8373d48c8d6bba3ec9dbd5d2fddb37
parent e3fb871d1ebeef4622de637291ffe33d0ac22f1c
author Amit Mahajan <amitmahajan@google.com> 1475775694 +0000
committer android-build-merger <android-build-merger@google.com> 1475775694 +0000

Merge "Stop StkAppService when no CatService is available"
am: e3fb871d1e

Change-Id: Ic7f0b355d6624c23a166392e084419bf18cf6cc2