| commit | 767f507a1aace7a5fff1663f30d56344f14fe571 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Oct 07 12:52:41 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 07 12:52:41 2013 -0700 |
| tree | 32d2547877e95e807a31a2d15b9b618ccc0fcf7c | |
| parent | eb7fa5830ab14ef9b05e1f064b3482eb56ff8671 [diff] | |
| parent | e68c01289eebc5a24b4f5652db19a1a6a3e1a066 [diff] |
am e68c0128: (-s ours) am a67fc7b7: (-s ours) am 6ac16894: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'e68c01289eebc5a24b4f5652db19a1a6a3e1a066': Import translations. DO NOT MERGE