OSDN Git Service

Merge "Read in the disable-keyguard-features flag from the XML file" into jb-mr1-dev
authorAmith Yamasani <yamasani@google.com>
Thu, 4 Oct 2012 18:56:29 +0000 (11:56 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 4 Oct 2012 18:56:29 +0000 (11:56 -0700)
commitdcf5a663cdec5ed1aa6b5d583cdac177a0974fcb
treecc27d1f47f5a42e55915d83db575d928652652c1
parent3364b2ff7970bea9013b53554caf98c2d5f783ed
parent7077b3c9bb7367bae3e073aa213de51baf3321a9
Merge "Read in the disable-keyguard-features flag from the XML file" into jb-mr1-dev