| commit | ffcad247d0401fb529441ecc65437226c2845461 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Wed Jun 04 20:17:40 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 04 20:17:40 2014 +0000 |
| tree | f239843fc95b6771bfcb9aad6bbcbe3532778611 | |
| parent | b1ca2a0c7fda713f5f2ebe928706dd813d87cabb [diff] | |
| parent | 904b89c58465b0d0822478be514572ec752df3e8 [diff] |
am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev * commit '904b89c58465b0d0822478be514572ec752df3e8': Distinguish between menus in ActionBar and popup. [DO NOT MERGE]