| commit | 863c2d0639e32e527bb5e0434dea0e30e91225a7 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Aug 06 17:40:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 06 17:40:20 2014 +0000 |
| tree | a0a2d7fb3d4b6727f16b939e90a0ffce1aceedb1 | |
| parent | ca529818a148b47ef2b6721eaa531084fc9a63fa [diff] | |
| parent | a775601fddffd1ecce3ff387d2e70c849d46293c [diff] |
am 6ee0eeeb: (-s ours) am fbca9fef: (-s ours) am 066b42c7: (-s ours) Import translations. DO NOT MERGE * commit '6ee0eeebe5c45a6114d6503977f232054a55ec09': Import translations. DO NOT MERGE