tree dbd3b1cd943e03371ff7c14e2bb612607f43fd0b
parent 831ddeffc93b152bd945c91362cd40798e018a71
parent c756ca257729c97647a235b467b2f8e30d1fe16c
author Andrew Sapperstein <asapperstein@google.com> 1501023679 +0000
committer android-build-merger <android-build-merger@google.com> 1501023679 +0000

Merge "Use config_headlineFontFeatureSettings for lockscreen clock" into oc-dr1-dev am: b63b011419 am: 404f96719d
am: c756ca2577

Change-Id: I343d200b87ed8dfc4bd8cc04b5a33a5f0d42ea06