tree 287d1260bdbf2d23bdbd1d7c17fd486b5d66348c
parent 749427867429f642ca7a8c6d13ecfd1d863c4464
parent efc08be01782dda7c4ebd00b53089c7a4a48f126
author Mark Renouf <mrenouf@google.com> 1480557445 +0000
committer android-build-merger <android-build-merger@google.com> 1480557445 +0000

Merge "Merge "Allow power button to close an input method" into cw-f-dev am: 33d498b946 am: 5544461b3e" into nyc-mr2-dev-plus-aosp
am: efc08be017

Change-Id: I9cd9e6639ff5fb3593e59c6e2b33d93d836c9390