| commit | a0e6d49c3bdf5415954f40eec28f8280467cbf8f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Dec 04 20:45:08 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 04 20:45:08 2014 +0000 |
| tree | 2281caadccd72129de9f88b3d3cc088967711447 | |
| parent | 48af2cf8cdfb2fb8d2cce37ee05d1705729131de [diff] | |
| parent | a786837be8181cfb251e695a8df8a0409dd1b4aa [diff] |
am a786837b: (-s ours) am 2253b8c5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit 'a786837be8181cfb251e695a8df8a0409dd1b4aa': Import translations. DO NOT MERGE