| commit | ea2eed6a6560f348c1084c58a2f01b2e3394b5b6 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Feb 27 00:51:09 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 27 00:51:09 2015 +0000 |
| tree | 1bf933ea1eafaf54e768c580fdda84e590c3d474 | |
| parent | bb23826d831107319341fb01c0219dae2abf3150 [diff] | |
| parent | 037250261f25a060c1a8ff3fd72d2967f1e9f6f4 [diff] |
am 03725026: (-s ours) am 791dcb95: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit '037250261f25a060c1a8ff3fd72d2967f1e9f6f4': Import translations. DO NOT MERGE