commit | 864e24715bdbd1c509628568868b1f8447801df4 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Nov 07 16:00:07 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 07 16:00:07 2014 +0000 |
tree | a2c99325330a6845a5be1dff4b3bb65fb115f650 | |
parent | 749868399ba941ce13edb510415dc88a0e094d7d [diff] | |
parent | b1ef825367588db74ecb6bd4ce3360d98a651b61 [diff] |
am b1ef8253: (-s ours) am 326b2919: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'b1ef825367588db74ecb6bd4ce3360d98a651b61': Import translations. DO NOT MERGE