tree 8eb10dbb7251db9e068c4707215a039ca5118bca
parent 8cdef8293f75b3bf3ba4f57d4bb58dae2bad1a64
parent 6a2d5e5b5450d0a276ba794cb3a50a21d16feebd
author Adam Powell <adamp@google.com> 1401501636 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401501636 +0000

am 8ce8cb05: Merge "Collapse contentInsets and View margins in Toolbars" into lmp-preview-dev

* commit '8ce8cb05143964700d85067fc88ae914f382f0c4':
  Collapse contentInsets and View margins in Toolbars