tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 5e2e19d41409aee6c55bc11771659e1c08ca25e1
parent df0ef08db5f9ea23f186ad2b34fde31bf32a2cd8
author Baligh Uddin <baligh@google.com> 1422685324 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685324 +0000

am df0ef08d: (-s ours) am 658fdd29: (-s ours) am 266749b5: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-queens

* commit 'df0ef08db5f9ea23f186ad2b34fde31bf32a2cd8':