From: Chris Wren <cwren@android.com>
Date: Mon, 24 Sep 2012 21:39:06 +0000 (-0700)
Subject: am 8bea3c3f: Merge "move remaining dock settings into sound settings fragment." into... 
X-Git-Tag: android-x86-4.4-r1~634^2~14^2~253
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c4fab6f61f3c6d22e1e80701604c9387004539d9;p=android-x86%2Fpackages-apps-Settings.git

am 8bea3c3f: Merge "move remaining dock settings into sound settings fragment." into jb-mr1-dev

* commit '8bea3c3fb8b3ecbb33fbd5b159faaa7d229e7cf1':
  move remaining dock settings into sound settings fragment.
---

c4fab6f61f3c6d22e1e80701604c9387004539d9