| commit | c8433b60a777863967f46de1bbbc92ff0336b2e1 | [log] [tgz] |
|---|---|---|
| author | Blazej Magnowski <johnasselta@google.com> | Fri Sep 25 19:42:07 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Sep 25 19:42:07 2015 +0000 |
| tree | 3902651cb03f458a802a5617f823ca4c1ddf7cb2 | |
| parent | efca0aa919e33236178e5db166bd05f12ae14a8f [diff] | |
| parent | 6dc59b48c040cf6871d7ff6d8e5242b1a5ddd032 [diff] |
Merge "Integration into other unlock mechanisms"