OSDN Git Service

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


Trivial merge