| commit | 5d6132be350c76ec1efbffe26d2a22f2caf8bb29 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 06 19:26:16 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 06 19:26:16 2014 +0000 |
| tree | 73417de4465ff2bdac98b93b9e7554d58a1aa65b | |
| parent | d60fed600acfa955128d045231ffe873a2330335 [diff] | |
| parent | 4c3ac5a2a5a8ba22ae9f8263fc4db11cf8fa3c19 [diff] |
am 4c3ac5a2: (-s ours) am b0413040: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '4c3ac5a2a5a8ba22ae9f8263fc4db11cf8fa3c19': Import translations. DO NOT MERGE