| commit | e73afce925efb97fef246ced278f2fdc25d8df45 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Aug 25 16:25:05 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 25 16:25:05 2014 +0000 |
| tree | 693e87d0c9f00f798ae1c830d548a9b6b9a14d7b | |
| parent | 1a8bb10f4c6e36ee2e535d2deb07016a15cdb514 [diff] | |
| parent | e54c72e67ffae24fb062103daa2b8e81c4a22e5f [diff] |
am e54c72e6: (-s ours) am 049a22bb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'e54c72e67ffae24fb062103daa2b8e81c4a22e5f': Import translations. DO NOT MERGE