tree 0af105d9a16355f7b17d54e098789e257c55a468
parent 6ed6dba025e91dbda670bc0283942e92400bd19f
parent e85da2bc2eeabb425c4b1270dbd0e22095aac957
author Michael Wright <michaelwr@google.com> 1466002041 +0000
committer android-build-merger <android-build-merger@google.com> 1466002041 +0000

Merge \"Make lid switch edge rather than level triggered.\" into nyc-dev
am: e85da2bc2e

Change-Id: Iba2a0acf6901f3b7b1d1d3bea6053ad6e2aea7db