From: Jason Monk <jmonk@google.com>
Date: Mon, 21 Jul 2014 17:24:29 +0000 (+0000)
Subject: am 724ec85e: Merge "Add Screen pinning back to settings" into lmp-dev
X-Git-Tag: android-x86-6.0-r1~671^2~1000^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=77fe5373826508345824927692fea942cf6a828a;p=android-x86%2Fpackages-apps-Settings.git

am 724ec85e: Merge "Add Screen pinning back to settings" into lmp-dev

* commit '724ec85e12405f86948aa235f59426075081b361':
  Add Screen pinning back to settings
---

77fe5373826508345824927692fea942cf6a828a