tree ae23c2cbf4ecbb3653722bc7f973eefc0c748a61
parent 02433650cb81a300339eff23aababa022a3b2fae
parent cde128ff436db88d3b89c09e1046cdd59edc04eb
author Eric Fischer <enf@google.com> 1367355835 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1367355835 -0700

am 0f49d40e: (-s ours) am 9922002f: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '0f49d40eb9fbc8c4fe3515b23784dd521d8d4a8d':