commit | 552411a439833353c2ec9222272611dfaf56cdd6 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Wed Oct 02 09:56:58 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 02 09:56:58 2013 -0700 |
tree | fa2e0c3c58f4dfe8143e1f4057ec106126f23829 | |
parent | baa4ab3362650bce62f1e88a3aa6a04b90ba2b6a [diff] | |
parent | 7fdb7ee70ad206c41ac4e8129efcb32f8f058cd1 [diff] |
am 7fdb7ee7: (-s ours) am 5a9c61e3: (-s ours) am 8f13241c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '7fdb7ee70ad206c41ac4e8129efcb32f8f058cd1': Import translations. DO NOT MERGE