tree 78b88dd416fef024a20e6a220bfbe6f2d54b65b6
parent 6f8429757b96be2cda1f857a3ad17ba866c4071c
parent 5d6da4eab024c13afbfef5cfec0f9f2b19168318
author Jorim Jaggi <jjaggi@google.com> 1453520849 +0000
committer android-build-merger <android-build-merger@google.com> 1453520849 +0000

Merge "NullPointerException when starting VoiceInteractionManagerService" am: b7fbe1104f
am: 5d6da4eab0

* commit '5d6da4eab024c13afbfef5cfec0f9f2b19168318':
  NullPointerException when starting VoiceInteractionManagerService