| commit | e8f7e8d6a0413e39fbcd18c7dedf7898e304b999 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Dec 01 17:11:22 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 01 17:11:22 2014 +0000 |
| tree | 722afd5f3eb8e540f8beedffeb63eebb14be532f | |
| parent | d48e7b859cb39f12b9f8ab4c7c7eccd3e6581049 [diff] | |
| parent | 5bba5aea8eef1567697e7d90ceb53f2366a2cecf [diff] |
am 5bba5aea: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '5bba5aea8eef1567697e7d90ceb53f2366a2cecf': Import translations. DO NOT MERGE