| commit | 044036d6c0874190d79cdcfee65847abb9604179 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Mar 23 22:42:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 23 22:42:59 2015 +0000 |
| tree | 48850f33184b22e8760dec79835bf064f986f749 | |
| parent | 7f6ff8c6eef11db9cd8f82f8773d8883fad5f822 [diff] | |
| parent | 3138de35c602fa7c978afcb41b8936210c7d8be4 [diff] |
am 3138de35: (-s ours) am 222dead3: (-s ours) am dd4dc51a: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit '3138de35c602fa7c978afcb41b8936210c7d8be4':