OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9bdc5d1 2f12147)
am 2f12147e: (-s ours) am a04497d7: am 5d376860: Merge "Avoid split action bar when...
authorJeff Sharkey <jsharkey@android.com>
Fri, 30 Nov 2012 02:04:52 +0000 (18:04 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 30 Nov 2012 02:04:52 +0000 (18:04 -0800)
* commit '2f12147e91ecdf3d8d36e1f0d82be85f69d735db':
  Avoid split action bar when it only has one item.  DO NOT MERGE.


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help