OSDN Git Service

Merge "DO NOT MERGE: Use quick_qs_total_height when QS is not disabled" into pi-dev
authorEvan Laird <evanlaird@google.com>
Wed, 18 Jul 2018 20:14:23 +0000 (13:14 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 18 Jul 2018 20:14:23 +0000 (13:14 -0700)
am: ca53cf7f9a

Change-Id: I5b324408048abe4977cd84767c8f034e4ccc56a9


Trivial merge