OSDN Git Service

am d49f9b25: am 2983ee55: (-s ours) am 12b657d7: am dade24b4: Merge "Distinguish...
authorDeepanshu Gupta <deepanshu@google.com>
Wed, 4 Jun 2014 20:25:54 +0000 (20:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Jun 2014 20:25:54 +0000 (20:25 +0000)
commit88c9ca28effb9745d13647bd25d34b6ef53e7cb9
tree4991447647f6d84a701f3362cc717e29e6ab7906
parent15ceb87a07d9ad1fba4265112492e34c5cc360f5
parentd49f9b25310ac63310b0e5c7aeedca1d9e6ccda0
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 'd49f9b25310ac63310b0e5c7aeedca1d9e6ccda0':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]