Merge "Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev am: 820d7c85c7
am: c14a9af008" into nyc-mr1-dev-plus-aosp
am: d0b92c27f6
* commit 'd0b92c27f6e19e6318471527774052414b37581f':
Change-Id: Iacfa6b929a6ec76a8500d2a2f00a377ad2536f20
This commit is contained in: