OSDN Git Service

am b9f29667: am 63c6a309: Merge "Add dock icon for top-level settings. #2367275"...
authorAmith Yamasani <yamasani@google.com>
Fri, 22 Jan 2010 20:36:04 +0000 (12:36 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 Jan 2010 20:36:04 +0000 (12:36 -0800)
Merge commit 'b9f2966707004b84760b498d8fc05b3c8f144f59'

* commit 'b9f2966707004b84760b498d8fc05b3c8f144f59':
  Add dock icon for top-level settings. #2367275


Trivial merge