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)
Merge commit '942feaa2eff1153564b98a01f644083c1b58cf2d'

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


Trivial merge