OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8b8ae61 2dded56)
am 2dded568: am 53bfcb52: am 7dca460a: Merge "[FRP] Use Lock type as header instead...
authorMaurice Lam <yukl@google.com>
Tue, 9 Dec 2014 00:55:49 +0000 (00:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 9 Dec 2014 00:55:49 +0000 (00:55 +0000)
* commit '2dded568fe0afbc18dda0a5abd0afa6911558dee':
  [FRP] Use Lock type as header instead of "Encryption"


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