tree 936716d593ab1ce8e5251033507ef2e1764111c0
parent 199a70f1820c38a9f1db1697ad91c4f5f07d00aa
parent 86318d768a2c5043e1261e9daacf1497d1e4a732
author Filip Gruszczynski <gruszczy@google.com> 1426617317 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426617317 +0000

am 86318d76: Merge "Option for going home when going to sleep for devices without physical button." into lmp-mr1-modular-dev

* commit '86318d768a2c5043e1261e9daacf1497d1e4a732':
  Option for going home when going to sleep for devices without physical button.