| commit | a0a708a2366dcbc7b716360ce7db54886a278dc4 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Thu Jun 21 16:47:15 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 21 16:47:15 2012 -0700 |
| tree | 4f7eb69e1bca6860cacca11a1906cd1bc602bbda | |
| parent | 50e5b2f24b0994bf3f20977f5b10b9b4aaf66cdb [diff] | |
| parent | 242f1323d2a2721bad4bd873785937d53ccdca8a [diff] |
am 242f1323: (-s ours) am cda69964: Merge "Import translations. DO NOT MERGE" into jb-dev * commit '242f1323d2a2721bad4bd873785937d53ccdca8a': Import translations. DO NOT MERGE