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)
commit7dca460af7a6a9d683ea398c6eb2e3f784aa6900
treed58320d5bf32084a722d612b385bb3f64b6c591d
parentfc988c03e11eba66ca28f6dbec6d889535638bbb
parent0973c31db164e09cb5be275cf0f991dd208ee0fa
Merge "[FRP] Use Lock type as header instead of "Encryption"" into lmp-mr1-dev