OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4a62d8e ab4fe2d)
am ab4fe2d9: am 9e51261d: am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses...
authorJohn Spurlock <jspurlock@google.com>
Mon, 27 Oct 2014 18:52:06 +0000 (18:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Oct 2014 18:52:06 +0000 (18:52 +0000)
* commit 'ab4fe2d94fc1a0f142a390ef25ca64bc83fa17a0':


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