OSDN Git Service

Merge changes from topic "am-4a0c0e3d-b1ad-44cf-9088-b37a160bc2ac" into oc-dev
authorBill Yi <byi@google.com>
Thu, 17 May 2018 23:48:54 +0000 (16:48 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 May 2018 23:48:54 +0000 (16:48 -0700)
commitaaddf187e405cb73c372ba78cbfed044bad57e79
tree2df3caf8ad0cbf3368c73baf7cb130e95a3d3a3e
parenteef34578b3d847930d3215ee9a83f9af6b7fc9ef
parent70060539aae86f66a1daf2a5bfaab20f9c36c82c
Merge changes from topic "am-4a0c0e3d-b1ad-44cf-9088-b37a160bc2ac" into oc-dev
am: 70060539aa

Change-Id: I871256a76c3af4e37959f729389114c694e15596