tree 10da860fcff71886af91d082e31f0e1917926848
parent 128fbc372bf7137e48fc8014121ec03aa33ba38c
parent adc3d45f4f60301bf4fcdfafb599b71e83b59168
author Baligh Uddin <baligh@google.com> 1414566104 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566104 +0000

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':