OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: e721fbddb5 -s ours...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Wed, 11 Oct 2017 20:33:34 +0000 (20:33 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 11 Oct 2017 20:33:34 +0000 (20:33 +0000)
commit9ba5681aecbb06f5f4df9826cb17816aca85f982
tree1b6cd75fcf2cfb3481e2913c9a31db66ce9b8233
parent17b8aa19c7d6e9ff7eb8a54031e15dc9f1e24262
parentd394cbacf781586aca42ef86bc37f990ae80313f
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