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

am: 18d0386

* commit '18d0386703bc7bf19c450d1ee3b1e39985dacd8a':

Change-Id: Id01c316accb32b6cb0be1886d01779fd68fb4b67
This commit is contained in:
Julia Reynolds
2016-04-27 18:56:02 +00:00
committed by android-build-merger

Diff Content Not Available