OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 60461f3 7d44fe6)
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am: f0ff1631de am: 2075d98be6
authorRussell Brenner <russellbrenner@google.com>
Tue, 17 Nov 2015 01:37:51 +0000 (01:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 Nov 2015 01:37:51 +0000 (01:37 +0000)
am: 7d44fe6fdb

* commit '7d44fe6fdb95dce08e4c8cd1a1c1a1c8f3ea4a63':
  Preserve FRP lock if wiped during SUW


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