OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f664a1 2983ee5)
am 2983ee55: (-s ours) am 12b657d7: am dade24b4: Merge "Distinguish between menus...
authorDeepanshu Gupta <deepanshu@google.com>
Wed, 4 Jun 2014 20:20:27 +0000 (20:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Jun 2014 20:20:27 +0000 (20:20 +0000)
* commit '2983ee55a6d578b15b4862c9c8523bf00f7d83d5':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help