commit | e68c01289eebc5a24b4f5652db19a1a6a3e1a066 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Mon Oct 07 12:49:59 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 07 12:49:59 2013 -0700 |
tree | 10242d534ee055fd64de846c2968075b1051c759 | |
parent | 087f350ef8eb6bc1f4c00717798dcb27aea0b8df [diff] | |
parent | a67fc7b7429124909e9dee83062a38e98be2d913 [diff] |
am a67fc7b7: (-s ours) am 6ac16894: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'a67fc7b7429124909e9dee83062a38e98be2d913': Import translations. DO NOT MERGE