tree ca406d06f5ecb8ab0a0af4c6442ec19aec0ac60b
parent 8ba7d2d248217ca0e7d14696d3de7eccba2325ad
parent e1baaaea64ae9a82b5fa47fd098a13a6a90c9b1c
author Baligh Uddin <baligh@google.com> 1348814180 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1348814180 -0700

Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev