| commit | fe279813264a4bd35450fdd4839a4924276df480 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 26 18:45:36 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 26 18:45:36 2014 +0000 |
| tree | 5ac053ada57286807f99a27538daa88afb0c3398 | |
| parent | b20cdd3b6be3cb76fd1bf74af111a3140362f125 [diff] | |
| parent | 42acb728272feccb1d61ccbbf778ee955053d79e [diff] |
am 42acb728: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '42acb728272feccb1d61ccbbf778ee955053d79e': Import translations. DO NOT MERGE