| commit | b62adc436ce064aff4b824bc71b7d73dabb8439b | [log] [tgz] |
|---|---|---|
| author | Jean Chalard <jchalard@google.com> | Thu May 31 03:35:58 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 31 03:35:58 2012 -0700 |
| tree | 46e4cba18aca56462e77c9ac2885a990a2ce14f0 | |
| parent | 38e7356493250b427d2307bd6cfcf0b61c09daa9 [diff] | |
| parent | 38a24ba82df4c9c95a4ec71dec6d4b6e82f374c6 [diff] |
am 38a24ba8: Merge "Add a whitelist entry" into jb-dev * commit '38a24ba82df4c9c95a4ec71dec6d4b6e82f374c6': Add a whitelist entry
diff --git a/java/res/values-en/whitelist.xml b/java/res/values-en/whitelist.xml index 5bf2ed1..9612aac 100644 --- a/java/res/values-en/whitelist.xml +++ b/java/res/values-en/whitelist.xml
@@ -59,6 +59,10 @@ <item>not</item> <item>255</item> + <item>bern</item> + <item>been</item> + + <item>255</item> <item>bur</item> <item>but</item>