OSDN Git Service

am 1f4049ed: Merge "Ask about redacted notifications after setting up a secure lock...
authorAdrian Roos <roosa@google.com>
Tue, 5 Aug 2014 19:12:22 +0000 (19:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 5 Aug 2014 19:12:22 +0000 (19:12 +0000)
* commit '1f4049edfe1937ce19c7d93a5576ea03db83ad50':
  Ask about redacted notifications after setting up a secure lock


Trivial merge