tree fae894778a590d986b7f8bbe5c3a26d1c20b0ea0
parent da4ea530eef65c60b48aac139fd321522bb4dece
parent 8bf5945c3f16397ded1e1bebfaeaca1575788c4f
author Kazuki Kobayashi <kazuki.x.kobayashi@sonymobile.com> 1484865302 +0000
committer android-build-merger <android-build-merger@google.com> 1484865302 +0000

Merge "Fix clipping for date and time on QS" am: a5f968806e am: 6cad668a25
am: 8bf5945c3f

Change-Id: Ia811eba9511d385e74668a97db11df3b8d0e9315