| commit | 72a823b9b07f9e4e7785d84feb3159be6dbe9b99 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Wed Jun 04 20:36:35 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 04 20:36:35 2014 +0000 |
| tree | ece236609cb0e25b0cfeca4fbc8d008588b8bc1f | |
| parent | 15c3fd31abdc6b318ea491a23ce1e4c3a6f229a8 [diff] | |
| parent | f2862a849c6ba93c61c8bcc03da2ca9b8b8cc86f [diff] |
am f2862a84: (-s ours) 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 'f2862a849c6ba93c61c8bcc03da2ca9b8b8cc86f': Distinguish between menus in ActionBar and popup. [DO NOT MERGE]