| commit | 3c15d8d6889806d0b517eec03ed6a4f8728ebc16 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Wed Jun 04 20:32:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 04 20:32:46 2014 +0000 |
| tree | 1a5ae5fd7f22042e6f23803dd3d2dba3f386d56b | |
| parent | f2862a849c6ba93c61c8bcc03da2ca9b8b8cc86f [diff] | |
| parent | 14104896770dd26195cd9ccfac8c1604cb95dbc6 [diff] |
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]