OSDN Git Service

am 14104896: am e4aa3138: am a9e82914: Merge branch \'klp-dev\' of https://googleplex...
authorDeepanshu Gupta <deepanshu@google.com>
Wed, 4 Jun 2014 20:32:46 +0000 (20:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Jun 2014 20:32:46 +0000 (20:32 +0000)
commit3c15d8d6889806d0b517eec03ed6a4f8728ebc16
tree1a5ae5fd7f22042e6f23803dd3d2dba3f386d56b
parentf2862a849c6ba93c61c8bcc03da2ca9b8b8cc86f
parent14104896770dd26195cd9ccfac8c1604cb95dbc6
am 14104896: am e4aa3138: am a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev

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