| commit | 0921fb86143041e588a4e8e445dda19dc6ec5ab3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Feb 27 00:51:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 27 00:51:27 2015 +0000 |
| tree | 1bf933ea1eafaf54e768c580fdda84e590c3d474 | |
| parent | ab0d19e5e07358114a539e65bb4f9a00a38ae61c [diff] | |
| parent | bf2d2ac2f82cbe4a64fa6a0d8bf0e5751eae4151 [diff] |
am bf2d2ac2: (-s ours) am 428472a1: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit 'bf2d2ac2f82cbe4a64fa6a0d8bf0e5751eae4151': Import translations. DO NOT MERGE