commit | b10251210ec064a30652293b235dc255187e4c89 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Dec 10 22:37:39 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 10 22:37:39 2014 +0000 |
tree | 2ac728a54c8d77deadaa132ea2fd7dbbf15e776b | |
parent | 5b03981f2b524a24423c4bbf1bcccb94e1d2c47e [diff] | |
parent | 2993c6fa2e16886839e38ed7fc9b297c6452c645 [diff] |
am 2993c6fa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '2993c6fa2e16886839e38ed7fc9b297c6452c645': Import translations. DO NOT MERGE