tree 161bad95d254ffb5787ddc2b0a88ed7a2e6c62eb
parent 97ed3f4b1ce40fd3ec8bc34bf2bfb7438b28afd7
parent 63c6a30908a14cdc8cccee3f6a3e88275dcec30e
author Amith Yamasani <yamasani@google.com> 1264002326 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1264002326 -0800

am 63c6a309: Merge "Add dock icon for top-level settings. #2367275" into eclair

Merge commit '63c6a30908a14cdc8cccee3f6a3e88275dcec30e' into eclair-plus-aosp

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