| commit | e4f1c8ab271c06c03d7b962efed9a669f3c8986b | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Mar 13 18:08:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 13 18:08:46 2014 +0000 |
| tree | c6d654f3afb5d1ece4681377c781f26ce8e5d5b8 | |
| parent | 70994e9eef43b6cf95ec6cf553dd97bf92567587 [diff] | |
| parent | c48e3d03436bd428ef5425114ea138ae097f1f20 [diff] |
am c48e3d03: (-s ours) am 4c9ebc4c: (-s ours) am c6ccb8a3: (-s ours) am 7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'c48e3d03436bd428ef5425114ea138ae097f1f20': Import translations. DO NOT MERGE