commit | 8b297fb6ef42650a1126287aa0b610aa9a503167 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Feb 20 18:03:05 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 20 18:03:05 2014 +0000 |
tree | 1c7669753ee3355ffc7a699a225cf5afda97794c | |
parent | 08394af265b02db7a76c4f4f4ae16b9d238e7580 [diff] | |
parent | 8027100fdb13c046838f9af12ef7bf2bc3ad511f [diff] |
am 8027100f: (-s ours) am e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '8027100fdb13c046838f9af12ef7bf2bc3ad511f': Import translations. DO NOT MERGE