commit | 4745ccf1aee9e8282747a978cb9e43cf0e3dc694 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Nov 29 21:29:10 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 29 21:29:10 2012 -0800 |
tree | ea48fc56af4c1683bfc607cbcd872fb068ba8238 | |
parent | bf6711a033dabce08f26e059c3b74c45822a819a [diff] | |
parent | df0c7e76014c0765e764da6dbfc2a08309ac6018 [diff] |
am df0c7e76: (-s ours) am 918c847d: am 43635081: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev * commit 'df0c7e76014c0765e764da6dbfc2a08309ac6018': Import translations. DO NOT MERGE