tree 522ed91984616bf5809ce68e9a20e715dc9f2c3b
parent dec133d5fd4dafb6f711474206c92f5a16d51621
parent 8562a7a110a0b012c33047884594cd4c449b27d0
author Amith Yamasani <yamasani@google.com> 1427322772 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427322772 +0000

am 8562a7a1: am eedf2fe0: am 0afd1905: Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev

* commit '8562a7a110a0b012c33047884594cd4c449b27d0':
  Fix NPE if FPE service does not exist.