tree cbc32143153a4da2c551b17d767a5207d2d564d1
parent 12062c6e99a8c17637177fe0e41ec95ea0fd977b
parent 38f75097ff0bc265dbfba9c40cda6c017078b82e
author Griff Hazen <griff@google.com> 1426983071 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426983071 +0000

am 38f75097: am 0b42ff79: Merge "Allow emulator to select a window outset bottom" into lmp-mr1-modular-dev

* commit '38f75097ff0bc265dbfba9c40cda6c017078b82e':
  Allow emulator to select a window outset bottom