| commit | f2862a849c6ba93c61c8bcc03da2ca9b8b8cc86f | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Wed Jun 04 20:32:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 04 20:32:43 2014 +0000 |
| tree | ba830ab2df3e7e3b0f190715b89a631671b84e4a | |
| parent | dddd2625585c80a16f47ef9322a5dee93094c9df [diff] | |
| parent | 4da5807ce0e6a190c5e1de37297d454368906e76 [diff] |
am 4da5807c: am 88c9ca28: am d49f9b25: am 2983ee55: (-s ours) am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev * commit '4da5807ce0e6a190c5e1de37297d454368906e76': Distinguish between menus in ActionBar and popup. [DO NOT MERGE]