| commit | 3138de35c602fa7c978afcb41b8936210c7d8be4 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat Mar 21 15:26:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Mar 21 15:26:34 2015 +0000 |
| tree | fb42151371c111b213593c34b14fb30b84d95e5b | |
| parent | 8d59b117bd4b0fed7d61d081878edd7fee81d54c [diff] | |
| parent | 222dead36e3ca93b3e4d79fcd6c10cc7d5115184 [diff] |
am 222dead3: (-s ours) am dd4dc51a: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit '222dead36e3ca93b3e4d79fcd6c10cc7d5115184': Import translations. DO NOT MERGE