tree c773ee153ff0f6d70315d04854aff2dc0739d09e
parent 75a6a525e9a34befd931fe666ee761625e6ead99
parent 1ff8b1ce3a44de7b5cbc3f5c6ea7b1e3f778a739
author Jean Chalard <jchalard@google.com> 1366962714 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366962714 -0700

am 1ff8b1ce: Merge "Update dictionaries"

* commit '1ff8b1ce3a44de7b5cbc3f5c6ea7b1e3f778a739':
  Update dictionaries