commit 192690b863a912fb1c1e7a7620ad6915933f9662
author The Android Open Source Project <initial-contribution@android.com> Tue Nov 06 12:24:04 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 06 12:24:04 2012 -0800
tree 04407d67a42e2736fb0cad90f62a3bebe9d2595b
parent 06c376edb0ee3194dbbfee1286bca92da9ca9815
parent 992df2fa1f649ae0ce11260325c310c247798da5

am 992df2fa: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '992df2fa1f649ae0ce11260325c310c247798da5':
  Always call setActivePolicies() when creating SecurityPolicy
  Force user to accept new policies
  DPM doesn't support hasGrantedPolicy to keyguard widgets
  Don't smartsend reply inappropriately
  Use correct test for updating attachment contentUri
  Handle non-ascii folder names properly
  Fix handling of header data
  Catch exception in monkey runs
  POP3 renovation
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE