tree 37cb4678124c4be34b449d0d626c4e10b7405251
parent 17b03239d3152cbcf450ec66f077f07e4c1870e1
parent 2493d947241c209ad6fcd562e998c320ef4c596e
author Filip Gruszczynski <gruszczy@google.com> 1427323880 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427323880 +0000

am 2493d947: am 9001f14b: Merge "Don\'t use windowOutsetBottom for insets, depend on display padding only." into lmp-mr1-modular-dev

* commit '2493d947241c209ad6fcd562e998c320ef4c596e':
  Don't use windowOutsetBottom for insets, depend on display padding only.