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)
commitf426ace9dab65c88b36a047bf921070edcf8cf61
tree4b9ad05c03c5d4771627eeab5bb0f2d7c79a196d
parent09a526faf311f77017f37af3fe8aba45bc2c32fb
parent32f0742e52de8cebdbbb6c8ede9d6f4315d50189
Merge "Only wipe device if primary user (for failed password attempts)" into jb-mr1.1-dev