diff options
author | Jim Miller <jaggies@google.com> | 2012-09-21 20:07:46 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-21 20:07:46 -0700 |
commit | 1cd5522fcc16b6a7d38f7f4d2997359759196856 (patch) | |
tree | 9ff423505c705a7fb33a53dd910ea3794575e7e8 /obex | |
parent | 8e586f61dd4f7fa53b01e63ac779ffc7cde05bdd (diff) | |
parent | 3fd47af32d6be8971445f4da8deba0fadae688d3 (diff) | |
download | frameworks_base-1cd5522fcc16b6a7d38f7f4d2997359759196856.zip frameworks_base-1cd5522fcc16b6a7d38f7f4d2997359759196856.tar.gz frameworks_base-1cd5522fcc16b6a7d38f7f4d2997359759196856.tar.bz2 |
Merge "Send USER_PRESENT for keyguard choice "None"" into jb-mr1-dev
Diffstat (limited to 'obex')
0 files changed, 0 insertions, 0 deletions