| commit | 477690f47321c124f4be1f2b8e564e4da096e086 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Oct 29 07:01:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:01:44 2014 +0000 |
| tree | 10da860fcff71886af91d082e31f0e1917926848 | |
| parent | 128fbc372bf7137e48fc8014121ec03aa33ba38c [diff] | |
| parent | adc3d45f4f60301bf4fcdfafb599b71e83b59168 [diff] |
am adc3d45f: (-s ours) am 785ca6bb: (-s ours) am fd855986: (-s ours) am baa58811: (-s ours) am 751f5fdc: (-s ours) am eb0cc542: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose * commit 'adc3d45f4f60301bf4fcdfafb599b71e83b59168':