OSDN Git Service

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


Trivial merge