OSDN Git Service

Merge changes from topic "am-2cc1b50f-d7fa-4824-840a-51adc851b2fa" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Sat, 3 Mar 2018 05:28:03 +0000 (05:28 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 3 Mar 2018 05:28:03 +0000 (05:28 +0000)
commitb59324afa1eb8611adda6df2e7117a16f25f7a9d
treeac837fe5889484c5ff814e3118bc972859433be5
parent3850cf69e32a7d99398099a74e61cd66116834b5
parent551e9b00eee2517a55173e3fe7017b2e0af3100b
Merge changes from topic "am-2cc1b50f-d7fa-4824-840a-51adc851b2fa" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 5d8bb93905 skipped: 2a68a8d9ad
  [automerger skipped] Import translations. DO NOT MERGE skipped: 5d8bb93905
  Import translations. DO NOT MERGE