OSDN Git Service

Merge changes from topic "am-0ee32b8ade9b4288bb89d13c68de291f"
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>
Fri, 26 Jan 2018 01:05:38 +0000 (01:05 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 26 Jan 2018 01:05:38 +0000 (01:05 +0000)
commit898f11eca9aa57ddc84efd36ea1d6bb6967b2079
treed483b26b07f7cd810efad0c7454a9d585c7ac2dc
parentf9bcdc06f6c2d56eaa4bbbfe3b27466cea692b65
parentc143ad8566c5f56d289fc358e6f8aa9d57b0a032
Merge changes from topic "am-0ee32b8ade9b4288bb89d13c68de291f"

* changes:
  Merge changes from topic "am-8df3bdfc-9f3c-40b2-b051-5cc0120da88b" into oc-dev am: eb9a92f942 am: 939313310b am: 6a423ee7ce am: 91de2d1cd0
  [automerger skipped] Import translations. DO NOT MERGE skipped: 816ddbdba7 skipped: e0e084e199 am: a9d64326ad  -s ours am: 8a35a13afe  -s ours am: 73f06fe35f  -s ours am: 3450afaf04  -s ours