OSDN Git Service

am 942feaa2: am 6ff80dcf: Fix #2377870 : NPE in Dock settings
authorAmith Yamasani <yamasani@google.com>
Fri, 22 Jan 2010 01:54:53 +0000 (17:54 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 Jan 2010 01:54:53 +0000 (17:54 -0800)
commitd4237f884a1e7aa7a73d8133896c3bea1c369234
tree29ecd1786e3606fa1d3087fd9eca9725a8e8116c
parent2197f83b6b8eed12d73c0ba249816d6e2af97ec3
parent942feaa2eff1153564b98a01f644083c1b58cf2d
am 942feaa2: am 6ff80dcf: Fix #2377870 : NPE in Dock settings

Merge commit '942feaa2eff1153564b98a01f644083c1b58cf2d'

* commit '942feaa2eff1153564b98a01f644083c1b58cf2d':
  Fix #2377870 : NPE in Dock settings