tree e83f09532153a09acc773a21478e1741ae417600
parent 06a314d65ad1583e76394d6c5846e3bbfd8eedcb
parent ba202e9fb299f4557190dbad5ed989a9c83a4380
author Svetoslav <svetoslavganov@google.com> 1413587320 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413587320 +0000

am ba202e9f: Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev

* commit 'ba202e9fb299f4557190dbad5ed989a9c83a4380':
  Accessibility no longer overrides strong encryption (Settings).