OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3fd2bbe d04e36e)
am d04e36e6: am 2f219c51: Merge "Fix inconsistent text in Settings>Security>Screen...
authorAmith Yamasani <yamasani@google.com>
Fri, 9 Aug 2013 13:06:52 +0000 (06:06 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 9 Aug 2013 13:06:52 +0000 (06:06 -0700)
* commit 'd04e36e6f2259747dac4c4a1fa0393f72dc078af':
  Fix inconsistent text in Settings>Security>Screen lock


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