tree 70b50f386244024f3202c1176c8aac761e955951
parent 43ce9b204ebedbd0d3a3ad24048f081b9b9f854d
parent 2fc826ec944cf85d1c3e65011091c58dc94110c0
author Eric Fischer <enf@google.com> 1317924198 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1317924198 -0700

am 2fc826ec: (-s ours) Import translations for late permission additions.

* commit '2fc826ec944cf85d1c3e65011091c58dc94110c0':
  Import translations for late permission additions.