tree 5e33fb413e7e3c5ae57a8494eb900717af12414a
parent d42aabbd394df36a87a2fc31cc6babfb72803d98
parent 331e2754295739a0ee5bd050dc68a445d2fb16d6
author Brian Attwell <brianattwell@google.com> 1408103474 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408103474 +0000

am 331e2754: am b73f46a1: am b628094e: Merge "QC scrim opacity depends on scroll position" into lmp-dev

* commit '331e2754295739a0ee5bd050dc68a445d2fb16d6':
  QC scrim opacity depends on scroll position