am b7de79d0: am 41bb82be: Merge "Fix NullpointException problem in onMenuItemSelected"

* commit 'b7de79d02743cc3b5372be27be818d3227a34e2b':
  Fix NullpointException problem in onMenuItemSelected