tree 40110a349503dcdb0870e5ca8db602aef0bb44b8
parent e89b6c38be89d42da2057be2213ac6080a8e311f
parent e2e24f8dd7dc43738d09365bcf61f3e458af05d2
author Ying Wang <wangying@google.com> 1342212033 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1342212033 -0700

Merge "Import translations. DO NOT MERGE"