| commit | 14720e7a38e8eccf289de6a6da7ea42c41d87a04 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Feb 12 23:04:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 12 23:04:54 2015 +0000 |
| tree | ce7cec99f0dd32e67464e93a42927f9da159c155 | |
| parent | 0bb60712f736fef0c3509231afed0fff7f8bfd2b [diff] | |
| parent | 6113edf578bba44de85698624026b4f48652fef9 [diff] |
am 6113edf5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev * commit '6113edf578bba44de85698624026b4f48652fef9': Import translations. DO NOT MERGE