| commit | 08ca5d2e535725c5a95f1936fb41f7509cb24780 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Sep 16 17:06:14 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 16 17:06:14 2014 +0000 |
| tree | 3d9832ebe642aff4c9f9e7507990aadc668bb538 | |
| parent | 0346c9369506df63c6395a1cccadec5f1a915a6a [diff] | |
| parent | 522ec48316a9efc36172fd68123b0807cd482ad1 [diff] |
am 522ec483: (-s ours) am a2b29d5f: (-s ours) am 58965944: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '522ec48316a9efc36172fd68123b0807cd482ad1': Import translations. DO NOT MERGE