| commit | 4ae0268ec57c5b4a683d685c209942dc2d0b78d7 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Apr 23 02:15:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 23 02:15:03 2014 +0000 |
| tree | d118ec8c8a64722569d0e7d1043817b0b0202628 | |
| parent | 59bb0de92f712a605a9e19bf0b16fcaa32f45dbd [diff] | |
| parent | 44cbb9f2294184c28542300d2b3e3f0b1ff96178 [diff] |
am 44cbb9f2: (-s ours) am 2d6e077d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit '44cbb9f2294184c28542300d2b3e3f0b1ff96178': Import translations. DO NOT MERGE