| commit | 22f863d2b7ed8cd16867d57d81c7f54e4319ba40 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Aug 27 17:24:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 27 17:24:33 2014 +0000 |
| tree | 3e24d239c47449a1833ce81ec3bba9b164940e0c | |
| parent | b30faa234b4624318bd5ea1c30db1cd2e0e6e807 [diff] | |
| parent | 1ac363fc4d042d83a2aa15cc0e9ad0a53671cf02 [diff] |
am 1ac363fc: (-s ours) am 68eb6f7b: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop * commit '1ac363fc4d042d83a2aa15cc0e9ad0a53671cf02': Import translations. DO NOT MERGE