| commit | b38f599221e1bc56ca9bb9f510f7f8ec4495e1d2 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat May 02 06:49:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat May 02 06:49:10 2015 +0000 |
| tree | 7472d0390720ae8335df161e681ed1a3a40d3f53 | |
| parent | d6a9daa65e9237914f8877fd6d9a6965e1e39147 [diff] | |
| parent | e647500ff8e852f858ccdef82893728473deeffc [diff] |
am e647500f: (-s ours) am 9eb25fad: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'e647500ff8e852f858ccdef82893728473deeffc': Import translations. DO NOT MERGE