| commit | 49b73d04eaecbaa248c193433c409be57900241b | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Jun 09 14:54:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 09 14:54:40 2015 +0000 |
| tree | a6b1aba642fc7e6f7ccb4ce493ecce8e403c3845 | |
| parent | b324afee2f16778b43efa8001d2bc7c0666eaaea [diff] | |
| parent | 42dfbff0e81f453b7f9f5116085b01584ea60257 [diff] |
am 42dfbff0: (-s ours) am e6f79288: (-s ours) Import translations. DO NOT MERGE * commit '42dfbff0e81f453b7f9f5116085b01584ea60257': Import translations. DO NOT MERGE