OSDN Git Service

am 724ec85e: Merge "Add Screen pinning back to settings" into lmp-dev
authorJason Monk <jmonk@google.com>
Mon, 21 Jul 2014 17:24:29 +0000 (17:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 21 Jul 2014 17:24:29 +0000 (17:24 +0000)
* commit '724ec85e12405f86948aa235f59426075081b361':
  Add Screen pinning back to settings


Trivial merge