commit | e62c9069f6878cb23e7b2860e3f3ec67d47ad2e9 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Aug 14 13:11:58 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 14 13:11:58 2012 -0700 |
tree | 5a924f9113be9e7e8138d391b346673c0355af67 | |
parent | 30e671bfc9ffbfe1a00bf7be6cece5e0e7830b64 [diff] | |
parent | 05e16515399192130b738446a6c38374cf65e85b [diff] |
am 05e16515: (-s ours) am cb5624b8: Merge "Import translations. DO NOT MERGE" into jb-dev * commit '05e16515399192130b738446a6c38374cf65e85b': Import translations. DO NOT MERGE