| commit | cd819ff62a1b7ba82bf07cc4c757a384fd8a1b99 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Aug 06 19:49:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 06 19:49:49 2014 +0000 |
| tree | 92731a60ad81f767e94f1065adbb43be53aa9bc5 | |
| parent | 9f86efef109c46093554873fcdb507629208a66b [diff] | |
| parent | 59ae58e88a0766606ae109cf32d2926e4795e4b6 [diff] |
am 59ae58e8: (-s ours) am 7be8f310: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '59ae58e88a0766606ae109cf32d2926e4795e4b6': Import translations. DO NOT MERGE