| commit | 22de9d079e39d24a9ec8419017783c1b2b2aee41 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Feb 27 16:34:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 27 16:34:26 2015 +0000 |
| tree | 4166f35e207a2990be6928d39dcc40a24f208838 | |
| parent | 0a12c0d82a3364c5d5413ae4dae179805496cd04 [diff] | |
| parent | aef36570d23d03eaaa891e12ee7ebbf1c07736df [diff] |
am aef36570: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit 'aef36570d23d03eaaa891e12ee7ebbf1c07736df': Import translations. DO NOT MERGE