tree aee92678a18f9dc4ded3f90ede9e0e30e1ce9284
parent d29b822d9ba37f4b4eab3d9506c8e3ccee33d64c
parent ac0e63dce748da23485ad7a28f95987b84c6b859
author Baligh Uddin <baligh@google.com> 1402110642 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1402110642 +0000

Merge "Import translations. DO NOT MERGE"