OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e87c63e c8235b8)
am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts...
authorDeepanshu Gupta <deepanshu@google.com>
Wed, 4 Jun 2014 20:27:49 +0000 (20:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Jun 2014 20:27:49 +0000 (20:27 +0000)
* commit 'c8235b8e7446c849df10ff2f897d2a3743b4934d':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]


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