tree 9f882343230d73dc8662847f5c41a34a527baca3
parent fa5e729d42adf9201df81d8db7018e8420ee1d11
parent 6d96d4034d1b12e1639b3d23e3a6acfbc639781d
author Android Build Merger (Role) <android-build-merger@google.com> 1499443013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1499443013 +0000

Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 9da0a744c5  -s ours" into oc-dr1-dev-plus-aosp