OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fe35ec5 f9c0f06)
Merge "Add get-disabled shell command to locksettings" into oc-mr1-dev
authorChavi Weingarten <chaviw@google.com>
Fri, 25 Aug 2017 16:40:02 +0000 (16:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 25 Aug 2017 16:40:02 +0000 (16:40 +0000)
am: f9c0f06526

Change-Id: I5e683ce2a92b195804b883cce425200180130815


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help