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