OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a9e8291 328b1f9)
am 328b1f92: (-s ours) am 5d3e3851: am af3f96e4: am e87c63e0: (-s ours) am d2dff39b...
authorDeepanshu Gupta <deepanshu@google.com>
Wed, 4 Jun 2014 20:20:52 +0000 (20:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Jun 2014 20:20:52 +0000 (20:20 +0000)
* commit '328b1f92787bb4d793398ba6d8aa9b2025c62ca1':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]


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