| commit | 4da5807ce0e6a190c5e1de37297d454368906e76 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Wed Jun 04 20:29:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 04 20:29:03 2014 +0000 |
| tree | ee31a41ae67dcd785e638f69061066d82a4d713e | |
| parent | c2086e09df1fa5b0f147f9474a9dd924f487468f [diff] | |
| parent | 88c9ca28effb9745d13647bd25d34b6ef53e7cb9 [diff] |
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 '88c9ca28effb9745d13647bd25d34b6ef53e7cb9': Distinguish between menus in ActionBar and popup. [DO NOT MERGE]