tree 247431662001b26bb8561fea962e699045ff3d29
parent 7f1435c303f71ad2a31f91040801e2d05dd36c29
parent ee10efd08a54cf841023c215f9736199a42e45f9
author Eric Fischer <enf@google.com> 1330717499 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1330717499 -0800

Merge "Import translations. DO NOT MERGE"