OSDN Git Service

Merge "Prevent launcher switching in Settings app." into lmp-dev
authorSander Alewijnse <salewijnse@google.com>
Thu, 7 Aug 2014 11:49:32 +0000 (11:49 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 5 Aug 2014 00:19:02 +0000 (00:19 +0000)
commit6a39bc68aea91483804d2ab8635159803208095d
tree0b88466dd48175575fb60cc86c8c8a1b95f50ef2
parentf34c3501948190acf44defefba8eb161ec6dc07b
parentcd40220372e3bac5bd52a8bfa4d4fce0e7d30078
Merge "Prevent launcher switching in Settings app." into lmp-dev
res/values/strings.xml