commit | 95391609d7a7b98bc4f4c42c87d64e783db10875 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Wed Oct 29 07:01:17 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:01:17 2014 +0000 |
tree | 10da860fcff71886af91d082e31f0e1917926848 | |
parent | 062ae877bd7d6294b5cbfd5004df5a771faa2d4b [diff] | |
parent | cea98f1ab06f24bde00e2fa24f9dbd51ce16eac0 [diff] |
am cea98f1a: (-s ours) am faf16c70: (-s ours) am 86759f2d: (-s ours) am 0ed8331d: (-s ours) am 4c38d175: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic * commit 'cea98f1ab06f24bde00e2fa24f9dbd51ce16eac0':