tree a7a4d540cd262e9a3f13e65681739f70d7730912
parent 720efc43d89ce9fd50b66f22cdb1bb4363cfb291
parent 6243edd818b84adfbe712d5d233d6414b33653ac
author Amith Yamasani <yamasani@google.com> 1323214570 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1323214570 -0800

Merge "New and improved silent mode on lockscreen." into ics-mr1