tree d0662c7710fa7525596a5b312203fe2b7f708300
parent 0ad58deca1bea95ea052ec2c4257bdf62d53fd54
parent eedf2fe04a94c13c4548082a3675c6888293ef4e
author Amith Yamasani <yamasani@google.com> 1427322351 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427322351 +0000

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

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