| commit | 93046e96b9430d4762ed6b3d96523cc2e183ffd4 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Oct 04 17:36:49 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 04 17:36:49 2013 -0700 |
| tree | 1077d61380ca5588ec2cb86d010ff1f332944c44 | |
| parent | 8b3c4c474680b9de41821aea95a7bec9a2c415cd [diff] | |
| parent | 9ecfbcf7cadf06f44a1f37080b985b2e4109b1f3 [diff] |
am badfa714: (-s ours) am 673b0fe2: (-s ours) am 15800b79: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'badfa7148acdd061e1eaca850562e2b85a261c12': Import translations. DO NOT MERGE