commit | c8adac069a79cc1ceec8d8b575f1856a6526a5d1 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Wed Oct 29 07:05:23 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:05:23 2014 +0000 |
tree | 10da860fcff71886af91d082e31f0e1917926848 | |
parent | a6bd81083aade4facd4a494b08169c850bf877fa [diff] | |
parent | 0a23ca9c06235e17d706a7bebc6c7de5422210f7 [diff] |
am 0a23ca9c: (-s ours) am f0f0326e: (-s ours) am bf78f00a: (-s ours) am aa61fd71: (-s ours) am 0ec53f47: (-s ours) am 33ce277a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic * commit '0a23ca9c06235e17d706a7bebc6c7de5422210f7':