| commit | 9acb00ee1f2fd8cb190af290a6fe12e01e0d99c1 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Nov 01 08:17:42 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 01 08:17:42 2013 -0700 |
| tree | 4838ba173301ef032f84dc34731c3ab488f7bfaa | |
| parent | b2b6aefaee57ce128f28de08bc0d8c287b4a0779 [diff] | |
| parent | 309e27d211972ba968179083695cf0d9be747dee [diff] |
am 309e27d2: (-s ours) am f625246b: (-s ours) am fcc395b3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '309e27d211972ba968179083695cf0d9be747dee': Import translations. DO NOT MERGE