tree ae23c2cbf4ecbb3653722bc7f973eefc0c748a61
parent 711cbd4cad2dd425d46bf1363283e501597b2e77
parent e09e57c63528bf1ecacd0c534cc61aea396c9a9e
author Eric Fischer <enf@google.com> 1367354905 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1367354905 -0700

am 06e1da6c: am 79361f84: (-s ours) am a97c5fbb: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-dev

* commit '06e1da6cb8e53c0c4dc9267bdbaba3ea9c0d7c32':