OSDN Git Service

Merge "SECURITY: Prevent preference intents from exploiting settings." into lmp-dev
authorCarlos Valdivia <carlosvaldivia@google.com>
Wed, 10 Sep 2014 00:16:15 +0000 (00:16 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 10 Sep 2014 00:16:16 +0000 (00:16 +0000)

Trivial merge