OSDN Git Service

Merge "Only wipe device if primary user (for failed password attempts)" into jb-mr1...
authorAmith Yamasani <yamasani@google.com>
Tue, 27 Nov 2012 23:37:40 +0000 (15:37 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 27 Nov 2012 23:37:40 +0000 (15:37 -0800)

Trivial merge