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