OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2eec33f 5da02a4)
am 5da02a47: am 29c4c88b: Merge "Whoops, missed a \'Sleep Mode\' -> \'Daydream\'...
authorJustin Ho <justinho@google.com>
Thu, 1 Nov 2012 01:36:00 +0000 (18:36 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 1 Nov 2012 01:36:00 +0000 (18:36 -0700)
* commit '5da02a476944c6ca3672cf00265f7f163028a8c5':


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