OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ef1048d ccb277e)
am ccb277ef: am b0e25f71: Merge "Follow API changes in framework." into jb-mr1-dev
authorJeff Sharkey <jsharkey@android.com>
Wed, 3 Oct 2012 02:07:30 +0000 (19:07 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 3 Oct 2012 02:07:30 +0000 (19:07 -0700)
* commit 'ccb277ef37f79d48c120e5860d831cc468ae1b9a':
  Follow API changes in framework.


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