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

* commit '262b311c3c7d68204a72d3ba87bd76883aec00e2':
  Fix NullpointException problem in onMenuItemSelected