| commit | 3af040b0099484fc6e67a75f4d5ba8c615cf3216 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Oct 07 12:52:33 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 07 12:52:33 2013 -0700 |
| tree | 32d2547877e95e807a31a2d15b9b618ccc0fcf7c | |
| parent | e0815e2692a2d64227d6922c411991e852b2a29f [diff] | |
| parent | 2c5ead86f6a45c6cb9295a6c189ea4e924953a80 [diff] |
am 2c5ead86: (-s ours) am 4d1fac94: (-s ours) am 8cc94767: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '2c5ead86f6a45c6cb9295a6c189ea4e924953a80': Import translations. DO NOT MERGE