OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 32fc975 7dca460)
am 7dca460a: Merge "[FRP] Use Lock type as header instead of "Encryption"" into lmp...
authorMaurice Lam <yukl@google.com>
Fri, 5 Dec 2014 22:12:51 +0000 (22:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Dec 2014 22:12:51 +0000 (22:12 +0000)
* commit '7dca460af7a6a9d683ea398c6eb2e3f784aa6900':
  [FRP] Use Lock type as header instead of "Encryption"


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