| commit | ef65538a7065d4caa4a3c5aae156d82645611277 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Feb 27 00:50:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 27 00:50:50 2015 +0000 |
| tree | 1bf933ea1eafaf54e768c580fdda84e590c3d474 | |
| parent | 1e711d996936fa1fec356e3f24384d5613ba2688 [diff] | |
| parent | 6de722ad64d29f2268f44a5aee61e4dd2685c450 [diff] |
am 6de722ad: (-s ours) am 46c5d0b1: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit '6de722ad64d29f2268f44a5aee61e4dd2685c450': Import translations. DO NOT MERGE