tree 5683ebd8db7a9bd38265be40af1966462d4c1096
parent e94012c5488af6e991be1a75ff80862902ee004c
parent 879a0a877ec340aac82c058956b14d8ad08a9ef8
author Baligh Uddin <baligh@google.com> 1462326790 +0000
committer android-build-merger <android-build-merger@google.com> 1462326790 +0000

Merge "Import translations. DO NOT MERGE am: 2317faf4d9  -s ours am: 2787b2d5df  -s ours" into nyc-mr1-dev-plus-aosp
am: 879a0a877e  -s ours

* commit '879a0a877ec340aac82c058956b14d8ad08a9ef8':

Change-Id: Icef9bd3eb0dcc7c3957e96fe2b6a5abf31ce176c