Merge "Show \'on the lockscreen\' setting in more contexts." into nyc-dev am: ae35c38

am: 481a277

* commit '481a277eb64ec9598afe83e19503995854d3d802':

Change-Id: I1001316b68231f8e4b1a82337edc3d2962fea213
This commit is contained in:
Julia Reynolds
2016-04-27 18:46:51 +00:00
committed by android-build-merger

Diff Content Not Available