OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c839a5 70cb9be)
Merge "Show progress user unlocking is delayed" into nyc-mr1-dev am: 2b0bd66d5b
authorJorim Jaggi <jjaggi@google.com>
Tue, 2 Aug 2016 19:32:46 +0000 (19:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 2 Aug 2016 19:32:46 +0000 (19:32 +0000)
am: 70cb9bea74

Change-Id: I83ef86126829af6a0f2cd2661d1b26495c93ee95


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