| commit | ec234355575c8472ec000138320f7d042f5283a8 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat Aug 01 16:45:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 01 16:45:46 2015 +0000 |
| tree | a30c4f1ac8f2bbe7db9cdc7853307082cf2e69b0 | |
| parent | 595d6af6d7f8e33773400a23bd6412c3baae24cb [diff] | |
| parent | 48ac99fc155cf107e5442a93a54245ccbdd94ac1 [diff] |
am 48ac99fc: (-s ours) am a8e033d1: (-s ours) Import translations. DO NOT MERGE * commit '48ac99fc155cf107e5442a93a54245ccbdd94ac1': Import translations. DO NOT MERGE