| commit | 3f07183ac1a8a8fe995d32816abf14167ff22cf8 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:32:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:32:44 2015 +0000 |
| tree | b48e44e889ea100dde938054152aa41027c8fbd2 | |
| parent | bfcf92f171ec08b49f1f6dcb4b86ca3c7fecf9f9 [diff] | |
| parent | e8332fcd7062b531ade6c91d0cb349b11ef28832 [diff] |
am e8332fcd: (-s ours) am 653e3ce3: (-s ours) Import translations. DO NOT MERGE * commit 'e8332fcd7062b531ade6c91d0cb349b11ef28832': Import translations. DO NOT MERGE