OSDN Git Service

am e4aa3138: am a9e82914: Merge branch \'klp-dev\' of https://googleplex-android...
authorDeepanshu Gupta <deepanshu@google.com>
Wed, 4 Jun 2014 20:29:06 +0000 (20:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Jun 2014 20:29:06 +0000 (20:29 +0000)
commit14104896770dd26195cd9ccfac8c1604cb95dbc6
treee84380c7650e65673d24fe17601ac0b1902b4538
parent4da5807ce0e6a190c5e1de37297d454368906e76
parente4aa31382139ee2e319110fbfff402e0c6315952
am e4aa3138: am a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev

* commit 'e4aa31382139ee2e319110fbfff402e0c6315952':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]