| commit | efed3af8a063cf04898d88a51422dc25ad21bc09 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Sep 12 09:33:43 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 12 09:33:43 2013 -0700 |
| tree | 6cc05e172889f11c2cf1b8a1abd680a6f12490e5 | |
| parent | 85aab114b34861fa4952f56bf692b2c0b40afeb6 [diff] | |
| parent | 6f6771dce814492cfb206e01010ce462dcf23c65 [diff] |
am 6f6771dc: (-s ours) am 294de016: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '6f6771dce814492cfb206e01010ce462dcf23c65': Import translations. DO NOT MERGE