| commit | 36e5a1de725f790ab63bec58f58bed01f2eea466 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 12 22:45:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 12 22:45:58 2014 +0000 |
| tree | 802a673275133ec089b9ff43c9690bc0dbd541d4 | |
| parent | a91c8003b84fa882dcf2b64fc21397419265ed25 [diff] | |
| parent | 4efde5ebbd235c564f12f71f6b17e8c28d611dd7 [diff] |
am 4efde5eb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '4efde5ebbd235c564f12f71f6b17e8c28d611dd7': Import translations. DO NOT MERGE