commit | 4438716699b4e745b95391a517fe847527898ca3 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Wed Oct 29 07:03:16 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:03:16 2014 +0000 |
tree | 10da860fcff71886af91d082e31f0e1917926848 | |
parent | 16460a4bcf0e617d6062516c07642367f961e3c1 [diff] | |
parent | 53997cf353ab36c3b461706166dc117e2014fe54 [diff] |
am 53997cf3: (-s ours) am 551d0621: (-s ours) am f0942091: (-s ours) am 861cdc99: (-s ours) am 8446d354: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic * commit '53997cf353ab36c3b461706166dc117e2014fe54':