tree 0a5e3c2440a4e6f326486e40697a477ab3119c64
parent 400907086ac1a304daa50a72013ac27a9c63b26b
parent 5ccb8b8c4d6eabcc984559ef9e71efdbb3de00d3
author The Android Open Source Project <initial-contribution@android.com> 1274206621 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1274206621 -0700

am 5ccb8b8c: merge from open-source master

Merge commit '5ccb8b8c4d6eabcc984559ef9e71efdbb3de00d3' into kraken

* commit '5ccb8b8c4d6eabcc984559ef9e71efdbb3de00d3':
  Fix updating and deleting FDN entries with an empty alpha identifier.
  Abort FDN delete when number is empty (instead of name)