OSDN Git Service

Merge "Suppressing Face Unlock during phone call - fix b/7339069" into jb-mr1-dev
authorDanielle Millett <dmillett@google.com>
Fri, 12 Oct 2012 20:16:37 +0000 (13:16 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 12 Oct 2012 20:16:38 +0000 (13:16 -0700)

Trivial merge