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