| commit | 14104896770dd26195cd9ccfac8c1604cb95dbc6 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Wed Jun 04 20:29:06 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 04 20:29:06 2014 +0000 |
| tree | e84380c7650e65673d24fe17601ac0b1902b4538 | |
| parent | 4da5807ce0e6a190c5e1de37297d454368906e76 [diff] | |
| parent | e4aa31382139ee2e319110fbfff402e0c6315952 [diff] |
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]