summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/10/changes
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2012-11-27 15:40:36 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-27 15:40:36 -0800
commit1c2c48cba61e87f54f4b413b2192963dc71d76e3 (patch)
tree9101e18d4679a907ba644cd03951b41803722027 /docs/html/sdk/api_diff/10/changes
parent712c26865c5d0491054143c15579c0c5db59923a (diff)
parentf426ace9dab65c88b36a047bf921070edcf8cf61 (diff)
am f426ace9: Merge "Only wipe device if primary user (for failed password attempts)" into jb-mr1.1-dev
* commit 'f426ace9dab65c88b36a047bf921070edcf8cf61': Only wipe device if primary user (for failed password attempts)
Diffstat (limited to 'docs/html/sdk/api_diff/10/changes')
0 files changed, 0 insertions, 0 deletions