tree 1fc8dd486c2b1d67de0fdf3aae64a59418760ff0
parent f9647fc3698b54ecfb87dbf91fd1fac4873e79af
parent 931ebcb22dc2a5c73dc0007f14638f2e7994fe7b
author Eric Fischer <enf@google.com> 1319733911 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1319733911 -0700

Merge changes Ie26719cb,I6d1b943b into ics-mr1

* changes:
  Import revised translations.  DO NOT MERGE
  Restore deleted string still referenced from layout.