tree b5482d5768d61ee222e33016b6b40c1448186139
parent e5cdcd764aff917274bb59fa67dac3a1a6e432e2
parent 1270223b2b3df8468d5957b31caf2d00da7331fd
author Jin Cao <jinyan@google.com> 1397596705 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397596705 +0000

am 1270223b: Merge "Ensure menu option visibility correctness" into ub-gmail-ur12-dev

* commit '1270223b2b3df8468d5957b31caf2d00da7331fd':
  Ensure menu option visibility correctness