commit | 480f83cfc661e437c77e6faa67a754ae22cee1d6 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Oct 11 17:34:07 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 11 17:34:07 2013 -0700 |
tree | b5a083881334fe689ef65ee0bea057101ce66875 | |
parent | e6cc525f45e6856a1344a5a21ca119748f7bf84f [diff] | |
parent | db79e4d41d21cf7daf403d680851d78c6c59a2af [diff] |
am db79e4d4: (-s ours) am 84f5bf82: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'db79e4d41d21cf7daf403d680851d78c6c59a2af': Import translations. DO NOT MERGE