OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f9ea5f9 4b2a602)
am 4b2a602e: am 323fa9c6: Merge "Display the correct encryption settings." into honeycomb
authorJason parks <jparks@google.com>
Tue, 25 Jan 2011 17:59:07 +0000 (09:59 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Jan 2011 17:59:07 +0000 (09:59 -0800)
* commit '4b2a602eaac76ab117e96271ac4474a0de15795e':
  Display the correct encryption settings.


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