tree e79ddf25ab36a43fca6f18090d5ef101d7d48f39
parent 58ba47cee0d2a4ffde64103641fe6b03797178b1
parent f2a76a563e2db80d7dac3f09f08d49e5aaa5b96e
author Android Build Merger (Role) <android-build-merger@google.com> 1501058153 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1501058153 +0000

Merge "Import translations. DO NOT MERGE am: c00e04f148  -s ours am: 794c8ce7b7  -s ours" into oc-dr1-dev-plus-aosp