| commit | 60d1fb60ff3604659ec7db3a35774defc142e6d7 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed May 21 15:43:30 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 21 15:43:30 2014 +0000 |
| tree | e1cda745af733e7678435ae356513a33d19fd751 | |
| parent | 64d5da0516cca471c9d8482ea6a2ba8d73bbfbc8 [diff] | |
| parent | b36100cf5e44d447a80c8a89bb8525588468f204 [diff] |
am 9472cadd: (-s ours) am ef2b35cc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit '9472cadd2219fbe956ea6ba32853efc12abbf69f': Import translations. DO NOT MERGE