| commit | e3fb2ae20ce1044f6724e9ee9339810b0b8cf3f9 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Thu May 31 15:54:44 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 31 15:54:44 2012 -0700 |
| tree | 18c58c61820cbfd68845ff99e0b0854047bb693e | |
| parent | 10cdaf9e8711bf4f3cbed57c64a51568b143459e [diff] | |
| parent | 9512935e21d2b29933b5e5282b038ca36ffcf1e0 [diff] |
am 9512935e: (-s ours) am 96e2a62a: Merge "Import translations. DO NOT MERGE" into jb-dev * commit '9512935e21d2b29933b5e5282b038ca36ffcf1e0': Import translations. DO NOT MERGE