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