| commit | 7dca460af7a6a9d683ea398c6eb2e3f784aa6900 | [log] [tgz] |
|---|---|---|
| author | Maurice Lam <yukl@google.com> | Fri Dec 05 21:56:59 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Dec 05 21:57:00 2014 +0000 |
| tree | d58320d5bf32084a722d612b385bb3f64b6c591d | |
| parent | fc988c03e11eba66ca28f6dbec6d889535638bbb [diff] | |
| parent | 0973c31db164e09cb5be275cf0f991dd208ee0fa [diff] |
Merge "[FRP] Use Lock type as header instead of "Encryption"" into lmp-mr1-dev