OSDN Git Service

am 905e113f: am 03df93bc: am 5cde33a6: am dcfba78f: am ed5ab0f0: am 022d8a9f: am...
authorDeepanshu Gupta <deepanshu@google.com>
Wed, 4 Jun 2014 20:52:36 +0000 (20:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Jun 2014 20:52:36 +0000 (20:52 +0000)
commite478c5624d5eeca5adc088d9328582bd5b487963
treef90d82675a737c4f13e01c08743a254068db143b
parent9f213b1e2b2db2589cbe2f6554fd6e18ed871bad
parent905e113f97560dbcf71cab517ab4c1ee4faaa4d3
am 905e113f: am 03df93bc: am 5cde33a6: am dcfba78f: 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 '905e113f97560dbcf71cab517ab4c1ee4faaa4d3':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]