commit | 1e7d845552ec22822b14fb59adafadbc4317b4a3 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Sep 28 16:30:14 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Sep 28 16:30:14 2017 +0000 |
tree | d34dd60368c091973d370a7b7bb9f490886f79ab | |
parent | 3ef3191d7feeae95271effb23c4277bf87994345 [diff] | |
parent | 6404945d73c71bb91e4b27923813f472732727fa [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: a980312abf -s ours am: 9f05e68ea5 -s ours am: cafd489390 -s ours" into oc-mr1-dev-plus-aosp