commit | 9ba5681aecbb06f5f4df9826cb17816aca85f982 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Oct 11 20:33:34 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Oct 11 20:33:34 2017 +0000 |
tree | 1b6cd75fcf2cfb3481e2913c9a31db66ce9b8233 | |
parent | 17b8aa19c7d6e9ff7eb8a54031e15dc9f1e24262 [diff] | |
parent | d394cbacf781586aca42ef86bc37f990ae80313f [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: e721fbddb5 -s ours am: 1018a5d4a1 -s ours am: ae4dc78421 -s ours" into oc-mr1-dev-plus-aosp