| commit | 330072b0146ffe148417d43ee0842c1238b6923d | [log] [tgz] |
|---|---|---|
| author | Jean Chalard <jchalard@google.com> | Fri Apr 26 01:26:08 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 26 01:26:08 2013 -0700 |
| tree | 1349a07af3761ff21db1c9cfb9a75d7778642991 | |
| parent | a9b0c4fb9d0247ccdc92984de2d972136a8d34bb [diff] | |
| parent | c03aaa1bde589f582daa83f1ecdc66ce8a4691b2 [diff] |
am c03aaa1b: Merge "[ZF2] Read settings for profanity filtering." * commit 'c03aaa1bde589f582daa83f1ecdc66ce8a4691b2': [ZF2] Read settings for profanity filtering.