commit | 0e12bc6f391c9c86a13a992fa43487d243808485 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Sep 12 19:19:53 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 12 19:19:53 2014 +0000 |
tree | 37a8e998acbecea18d08370508bb51b331ffb4c1 | |
parent | 76cd8256f855fe9f6f9698d6093c5187cad67e58 [diff] | |
parent | a71b0d0f8bf2b2189d3467d0fe758574d3112144 [diff] |
am c86a0c0c: (-s ours) am e174dc5d: (-s ours) am a56e65fc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'c86a0c0cc2f2c5068215680d7a497766c545cc64': Import translations. DO NOT MERGE