OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1ab76fe 932f360)
Merge "Add a Setting for whether or not we have been disabled by policy." into oc...
authorDaniel Nishi <dhnishi@google.com>
Thu, 6 Jul 2017 22:22:37 +0000 (22:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 22:22:37 +0000 (22:22 +0000)
am: 932f36050c  -s ours

Change-Id: I7753c7042f79d98a36a01a56a832b62645143145


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