tree 26fbd82e82f375cb632a2b61d5539f5fb1455fc5
parent 28077d2765ad649eb098a075c0004a2879f637f9
parent 01d8880cd45f72f20c9c7a0be0bdc09e9463cce5
author Eric Fischer <enf@google.com> 1337293931 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337293931 -0700

am 01d8880c: (-s ours) am 517705de: Import translations. DO NOT MERGE

* commit '01d8880cd45f72f20c9c7a0be0bdc09e9463cce5':
  Import translations. DO NOT MERGE