tree 10da860fcff71886af91d082e31f0e1917926848
parent bc73cc58612c13626d9bea05859deef5475f44c2
parent b6a22674dd6006167b8d90d4c198f173548991f9
author Baligh Uddin <baligh@google.com> 1414566217 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566217 +0000

am b6a22674: (-s ours) am 62afccaf: (-s ours) am 5c49a8df: (-s ours) am 4776bdf4: (-s ours) am c4a95d3c: (-s ours) am e5128031: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose

* commit 'b6a22674dd6006167b8d90d4c198f173548991f9':