diff options
| author | Geoff Mendal <mendal@google.com> | 2014-11-13 02:12:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-13 02:12:43 +0000 |
| commit | ed1535dca1c49ffa882d45fd540bbfb95c0d4a51 (patch) | |
| tree | 37f622f19e9c2d84ffca2c2e46b4b3a5666ad7d7 /res | |
| parent | e6c8d3d91b48fefe840f953a44179e224386b107 (diff) | |
| parent | 859a9548ae095a2eb237c6c94680cec2963e6bd3 (diff) | |
am 859a9548: (-s ours) am 36e5a1de: (-s ours) am 4efde5eb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '859a9548ae095a2eb237c6c94680cec2963e6bd3':
Import translations. DO NOT MERGE
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions