tree 1349a07af3761ff21db1c9cfb9a75d7778642991
parent a9b0c4fb9d0247ccdc92984de2d972136a8d34bb
parent c03aaa1bde589f582daa83f1ecdc66ce8a4691b2
author Jean Chalard <jchalard@google.com> 1366964768 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366964768 -0700

am c03aaa1b: Merge "[ZF2] Read settings for profanity filtering."

* commit 'c03aaa1bde589f582daa83f1ecdc66ce8a4691b2':
  [ZF2] Read settings for profanity filtering.