commit | 45d7fd85a24725f8ea244af213772ecf2d0b97db | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Jun 07 12:25:52 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 07 12:25:52 2013 -0700 |
tree | 8b49ff61d424052936ab6e9bd1e8f6dca187683c | |
parent | 02717449e6c37fe6465048887aa1efa35d15a379 [diff] | |
parent | e84b20ba2ff70fd4eff8d213dc9f89f1f57f15c1 [diff] |
am e84b20ba: (-s ours) am 2db8ca13: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit 'e84b20ba2ff70fd4eff8d213dc9f89f1f57f15c1': Import translations. DO NOT MERGE