OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5925e19 1cb4539)
Resolves conflicts for merge of 1cb45399 to lmp-mr1-dev
authorPaul Crowley <paulcrowley@google.com>
Thu, 20 Nov 2014 10:16:50 +0000 (10:16 +0000)
committerPaul Crowley <paulcrowley@google.com>
Thu, 20 Nov 2014 10:37:39 +0000 (10:37 +0000)
Conflicts:
src/com/android/settings/CryptKeeper.java

Change-Id: I3d16d6b571e9c493df23cb6cedd7e9ed929a43da


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