| commit | 18f4fefb85c4cfad70f308b3d916f74eb060cc1a | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Thu Jun 21 12:03:53 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 21 12:03:53 2012 -0700 |
| tree | f7265cca4ced28f823d55778fd53c9cf754aa2f3 | |
| parent | ef472603c84cbb5b97eef8e9dfef66700c075354 [diff] | |
| parent | 7059a022fec306121885f207b4ab89d4302967a0 [diff] |
am 7059a022: (-s ours) am da036c8a: Merge "Import translations. DO NOT MERGE" into jb-dev * commit '7059a022fec306121885f207b4ab89d4302967a0': Import translations. DO NOT MERGE