OSDN Git Service

Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev
authorAtanas Kirilov <akirilov@google.com>
Mon, 4 Jun 2018 22:36:29 +0000 (15:36 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 4 Jun 2018 22:36:29 +0000 (15:36 -0700)
commit74d98110f378d9d3c24b36171d89ca605409d1ef
tree2aed0bda478eed87490ff8a5380d8b68f1c3094f
parent48aa959b146a56edbbb3bf4adee4425309e5a354
parent826b14e43ea9daaba91da8abf5e31aa32045e204
Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev
am: 826b14e43e

Change-Id: If4056f03d27f845d30862b04dcbdb119141f2bf8