| commit | dcfba78fbb4dad6792113383b2d32eff7f2c1f88 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Wed Jun 04 20:38:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 04 20:38:25 2014 +0000 |
| tree | 64855e6a990c18dc7f87677a66b845170f68ccd8 | |
| parent | 328b1f92787bb4d793398ba6d8aa9b2025c62ca1 [diff] | |
| parent | ed5ab0f01eac6686165f67fe0e9dec3bb48bbb4b [diff] |
am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev * commit 'ed5ab0f01eac6686165f67fe0e9dec3bb48bbb4b': Distinguish between menus in ActionBar and popup. [DO NOT MERGE]