tree 8fed4aa385c85586a8e65d7e6c5cb2a9a0966e90
parent cfa500421d5e092c05785b2bd0b216eb664adf53
parent ac9607237943419e03956f92d6d3efcb1daea5ec
author Eric Fischer <enf@google.com> 1334360790 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1334360790 -0700

Merge "Import translations. DO NOT MERGE"