OSDN Git Service

Merge "[FRP] Use Lock type as header instead of "Encryption"" into lmp-mr1-dev
authorMaurice Lam <yukl@google.com>
Fri, 5 Dec 2014 21:56:59 +0000 (21:56 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 5 Dec 2014 21:57:00 +0000 (21:57 +0000)

Trivial merge