diff options
author | Danielle Millett <dmillett@google.com> | 2012-10-12 13:16:37 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-12 13:16:38 -0700 |
commit | 8ec3ff8dcc68d246fcaafb98050ec9be4f7ec34a (patch) | |
tree | 39a2aadfe26c7a50356818c546d96d163985f548 /core/java | |
parent | 67747a68c1ce123a4f32876ecf4ccf66d0793b59 (diff) | |
parent | d95c659a1d621dfbdd892759419ffc089e248672 (diff) | |
download | frameworks_base-8ec3ff8dcc68d246fcaafb98050ec9be4f7ec34a.zip frameworks_base-8ec3ff8dcc68d246fcaafb98050ec9be4f7ec34a.tar.gz frameworks_base-8ec3ff8dcc68d246fcaafb98050ec9be4f7ec34a.tar.bz2 |
Merge "Suppressing Face Unlock during phone call - fix b/7339069" into jb-mr1-dev
Diffstat (limited to 'core/java')
0 files changed, 0 insertions, 0 deletions