| commit | eae61b82bdfd49ac09146b6069596ea5c864c3e0 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sat Aug 16 04:02:13 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 16 04:02:13 2014 +0000 |
| tree | 298dcebf229b7d3a5284aee574a144ca11b4a4f0 | |
| parent | 2abea6c457e869e18da9a32fed548874384add96 [diff] | |
| parent | 5b634929763b1b481ad642770756bc67ac89080f [diff] |
am 5b634929: (-s ours) am 3f374ac1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit '5b634929763b1b481ad642770756bc67ac89080f': Import translations. DO NOT MERGE