tree 10da860fcff71886af91d082e31f0e1917926848
parent e517024081234522d1916e7340394e50745aadc0
parent 02aefa8d2ec8088f7312b4ac9ab5251458a43d23
author Baligh Uddin <baligh@google.com> 1414566121 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566121 +0000

am 02aefa8d: (-s ours) am 5560a6d6: (-s ours) am 8608b163: (-s ours) am e02cb223: (-s ours) Import translations. DO NOT MERGE

* commit '02aefa8d2ec8088f7312b4ac9ab5251458a43d23':