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

Change-Id: I713148b72b889323fddac7f2c9788d27cf11588a
tree: 34de7e645aac927e3304a38f9b523949189d4d18
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml