OSDN Git Service

Merge changes from topic "am-25c8f1dd-79b2-410a-8aa9-2fe914e32aa3" into oc-dev
authorBill Yi <byi@google.com>
Mon, 1 Oct 2018 06:25:30 +0000 (23:25 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 1 Oct 2018 06:25:30 +0000 (23:25 -0700)
commitc270ca1086c99a9557481b81f3ef4e663a751440
treedf5002817ff3dccadf02acdfc0c0377575363479
parent4c4783d520d363182f681dabba03d2c93394ca50
parent1825d87bc769c54b04dd89b9e6766ff66591f565
Merge changes from topic "am-25c8f1dd-79b2-410a-8aa9-2fe914e32aa3" into oc-dev
am: 1825d87bc7

Change-Id: Ifff670d53d6cbfddac8756f1f7f1352a77528036