tree 34de7e645aac927e3304a38f9b523949189d4d18
parent c94b0bd7dd79a2b423eb0b02a56fc062e6535bed
parent 1ff8ecebeb4e57d1d74df43bd96d0b3253acae70
author Sudheer Shanka <sudheersai@google.com> 1468436460 +0000
committer android-build-merger <android-build-merger@google.com> 1468436460 +0000

Merge \\"Make sure nav bar doesn\\'t come up on pressing power button.\\" into nyc-mr1-dev am: dda5bba1c8
am: 1ff8ecebeb

Change-Id: I713148b72b889323fddac7f2c9788d27cf11588a