OSDN Git Service

am 6173fed5: am 6a39bc68: Merge "Prevent launcher switching in Settings app." into...
authorSander Alewijnse <salewijnse@google.com>
Thu, 7 Aug 2014 12:01:05 +0000 (12:01 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 7 Aug 2014 12:01:05 +0000 (12:01 +0000)
* commit '6173fed5a9afa1c410067e4840a3371b1c08490a':
  Prevent launcher switching in Settings app.


Trivial merge