tree c68b9a6e3155b56c2514cc1b3b58a46437371bfe
parent 633a45a0d4e095ae81fc2c3e882c23a6513bbaee
parent c4aa3c781a0ddce64853cd5d88bf97f8a9faf98b
author Benjamin Franz <bfranz@google.com> 1430298920 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430298920 +0000

am c4aa3c78: Merge "Add status bar flag to disable quick settings" into mnc-dev

* commit 'c4aa3c781a0ddce64853cd5d88bf97f8a9faf98b':
  Add status bar flag to disable quick settings