tree a47d7c98bdc2af3cff638aa71599ca64e5c1c459
parent f620620c08a67366db58d8a4ba6b7d8081b0903c
parent f3e1874420a5705173acf51b819763a624c840fa
author Baligh Uddin <baligh@google.com> 1463958690 +0000
committer android-build-merger <android-build-merger@google.com> 1463958690 +0000

Import translations. DO NOT MERGE am: 6dc837f102  -s ours
am: f3e1874420  -s ours

* commit 'f3e1874420a5705173acf51b819763a624c840fa':

Change-Id: I8fdd9fd8f2ea6f0b94abce02f26b077e4a0bfa7a