From: Sander Alewijnse <salewijnse@google.com>
Date: Thu, 7 Aug 2014 11:57:49 +0000 (+0000)
Subject: am 6a39bc68: Merge "Prevent launcher switching in Settings app." into lmp-dev
X-Git-Tag: android-x86-6.0-r1~671^2~856^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6173fed5a9afa1c410067e4840a3371b1c08490a;p=android-x86%2Fpackages-apps-Settings.git

am 6a39bc68: Merge "Prevent launcher switching in Settings app." into lmp-dev

* commit '6a39bc68aea91483804d2ab8635159803208095d':
  Prevent launcher switching in Settings app.
---

6173fed5a9afa1c410067e4840a3371b1c08490a