| commit | 3efcd8da613184e58ea1b23d37c1ad3bd2a141ca | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 26 14:50:06 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 26 14:50:06 2014 +0000 |
| tree | beb85ecca10814ac765e584e40e16c5554db960e | |
| parent | f1b05619cc44b039721110955695fa261f1746da [diff] | |
| parent | 441d4f04d1e7a3223449add1c70d9d2831277d0e [diff] |
am 441d4f04: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '441d4f04d1e7a3223449add1c70d9d2831277d0e': Import translations. DO NOT MERGE