| commit | cdcd266362ead0f5d2e1473398868600a9c02441 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 19 14:29:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 19 14:29:29 2015 +0000 |
| tree | ee8a8f840d4285478c8a48f6c5eac5fbb07103a6 | |
| parent | 75313c4ebbff9c8e6bb1e85332f8896a138b021f [diff] | |
| parent | 69988b3cee1df8fd1fee9ae2041a0981cc491bd2 [diff] |
am 69988b3c: (-s ours) am ffdbfaaf: (-s ours) am 2a09706e: (-s ours) Import translations. DO NOT MERGE am: 5e4863205e -s ours * commit '69988b3cee1df8fd1fee9ae2041a0981cc491bd2': Import translations. DO NOT MERGE