tree b1bf7134c7b592a7abe54401a1b518e4be57b0b5
parent 947ef9a7171fa0750cf3c027a2cb487f827cff06
parent 4215ae01002f1217587698d24636870ace4a50f5
author Jason Monk <jmonk@google.com> 1464802669 +0000
committer android-build-merger <android-build-merger@google.com> 1464802669 +0000

Merge "QS: Fix single expanded frame from layout" into nyc-dev
am: 4215ae0100

* commit '4215ae01002f1217587698d24636870ace4a50f5':
  QS: Fix single expanded frame from layout

Change-Id: Id3571cce3d2b4ecd01e5ea8bf1f093e08952a757