OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE: Use quick_qs_total_height when QS is not...
authorEvan Laird <evanlaird@google.com>
Wed, 18 Jul 2018 20:19:38 +0000 (13:19 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 18 Jul 2018 20:19:38 +0000 (13:19 -0700)
commit7acf09e42eea4b23402f8a26df6a1021f2655d33
tree5f51eaf7d1f74f6bc13e19c1491f3d9dd4429726
parent9246e1cb4ea8e8c26c3fb22df509993348c72a06
parent08f22c1e2d2762788f617e2a6c1c3bbd150f5970
[automerger skipped] Merge "DO NOT MERGE: Use quick_qs_total_height when QS is not disabled" into pi-dev am: ca53cf7f9a
am: 08f22c1e2d  -s ours

Change-Id: I028da01c98ba1e1af460b00564849e748ce6d38d