| commit | 41426ac4dfd24d1a143c133f76f3c87363cc049b | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Nov 11 00:30:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 11 00:30:38 2014 +0000 |
| tree | 89c7e0539f1b5bef98b35d33a2e545046e86d733 | |
| parent | 02c19093088a482dd78065b4b5c365da60a9a2f9 [diff] | |
| parent | 2b1aca5c3359d55f39a657851b77581e4b3696c3 [diff] |
am 7c10556c: (-s ours) am 64414f49: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '7c10556caa1efe56303230a3a9fe7d16ab71ef11': Import translations. DO NOT MERGE