OSDN Git Service

Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev
authorBill Yi <byi@google.com>
Fri, 6 Jul 2018 03:58:16 +0000 (20:58 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 Jul 2018 03:58:16 +0000 (20:58 -0700)
commit851e82678307c8d8b1af8929e7771e4163c97c71
tree1fdea631d5d584f1658a7b3eb17199824f76c9ea
parentf2ea6f55d9eeff0f9b30e99be450ca33c64890e4
parent6005492cb2799c2e1b6828d31491b7ca3e2fac0a
Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev
am: 6005492cb2

Change-Id: I71789a270fc86b5fc9c74c0de2cd122f1ac26c5e