OSDN Git Service

am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am...
authorDeepanshu Gupta <deepanshu@google.com>
Wed, 4 Jun 2014 20:38:25 +0000 (20:38 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Jun 2014 20:38:25 +0000 (20:38 +0000)
commitdcfba78fbb4dad6792113383b2d32eff7f2c1f88
tree64855e6a990c18dc7f87677a66b845170f68ccd8
parent328b1f92787bb4d793398ba6d8aa9b2025c62ca1
parented5ab0f01eac6686165f67fe0e9dec3bb48bbb4b
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]