| commit | dcf5a663cdec5ed1aa6b5d583cdac177a0974fcb | [log] [tgz] |
|---|---|---|
| author | Amith Yamasani <yamasani@google.com> | Thu Oct 04 11:56:29 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Oct 04 11:56:29 2012 -0700 |
| tree | cc27d1f47f5a42e55915d83db575d928652652c1 | |
| parent | 3364b2ff7970bea9013b53554caf98c2d5f783ed [diff] | |
| parent | 7077b3c9bb7367bae3e073aa213de51baf3321a9 [diff] |
Merge "Read in the disable-keyguard-features flag from the XML file" into jb-mr1-dev