tree 571bf2ce8ffd60bfc554da21dbf570978e705d04
parent c1c5d4faa22a7d22b8225b2bbf83206698b83763
parent 994da2ad3242407fd822e6b35e3d302a3667d9c3
author Tom Taylor <tomtaylor@google.com> 1320959476 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1320959476 -0800

Merge "Revert "Add new secure setting for controlling Messaging notifications"" into ics-mr1