tree ed76581e4d5bcd3a4a9e3ed9b11465a74ae3ddc3
parent 04ff99c8ac7742e952afb8a25b17f7997fc907de
parent 263462b2064dbbe03cc9613763274270eff0dd42
author Eric Fischer <enf@google.com> 1330545430 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1330545430 -0800

Merge "Import translations. DO NOT MERGE"