| commit | 328b1f92787bb4d793398ba6d8aa9b2025c62ca1 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Wed Jun 04 20:15:37 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 04 20:15:37 2014 +0000 |
| tree | 31166696c548473788926b6e0e31749fcd54474c | |
| parent | 2983ee55a6d578b15b4862c9c8523bf00f7d83d5 [diff] | |
| parent | 5d3e3851bbe1ab0b30e593b371e98f02f5ed2f5d [diff] |
am 5d3e3851: am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev * commit '5d3e3851bbe1ab0b30e593b371e98f02f5ed2f5d': Distinguish between menus in ActionBar and popup. [DO NOT MERGE]