OSDN Git Service

am 5ccb8b8c: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 18 May 2010 18:17:01 +0000 (11:17 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 May 2010 18:17:01 +0000 (11:17 -0700)
commit7e4881eceec2dd1abbc2cec3b9f6c746af8f1e14
tree6993687d0c39d4fe3303d40166c0ad7450e9e969
parentb47eaa315d626e92ac58ff74efddd53e64b7451d
parent7074d8febb8a3812fbcebceeb52aa7f5df454776
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)