OSDN Git Service

am af85b740: Merge "SECURITY: Prevent preference intents from exploiting settings...
authorCarlos Valdivia <carlosvaldivia@google.com>
Wed, 10 Sep 2014 00:24:44 +0000 (00:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 10 Sep 2014 00:24:44 +0000 (00:24 +0000)
* commit 'af85b740461b69d9b52d6d19a81d06f3a15b6507':
  SECURITY: Prevent preference intents from exploiting settings.


Trivial merge